yuedefeng 6 år sedan
förälder
incheckning
eb9e754451
19 ändrade filer med 45 tillägg och 47 borttagningar
  1. 4 6
      src/dashoo.cn/frontend_web/nuxt.config.ignore.js
  2. 1 1
      src/dashoo.cn/frontend_web/src/components/oilsupplier/auditfilelist.vue
  3. 1 1
      src/dashoo.cn/frontend_web/src/components/oilsupplier/subfilelist.vue
  4. 5 5
      src/dashoo.cn/frontend_web/src/components/samples/cellscollectiondialog.vue
  5. 6 6
      src/dashoo.cn/frontend_web/src/components/samples/maintainlogdialog.vue
  6. 1 1
      src/dashoo.cn/frontend_web/src/components/samples/protocoldialog.vue
  7. 1 1
      src/dashoo.cn/frontend_web/src/components/samples/uploadattachdialog.vue
  8. 2 2
      src/dashoo.cn/frontend_web/src/pages/documentmanage/_opera/edit.vue
  9. 1 1
      src/dashoo.cn/frontend_web/src/pages/documentmanage/_opera/uploadnewdoc.vue
  10. 2 2
      src/dashoo.cn/frontend_web/src/pages/documentmanage/add.vue
  11. 1 1
      src/dashoo.cn/frontend_web/src/pages/oilsupplier/qualchange/_opera/auditoperation.vue
  12. 1 1
      src/dashoo.cn/frontend_web/src/pages/oilsupplier/qualchange/_opera/operation.vue
  13. 1 1
      src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue
  14. 1 1
      src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue
  15. 1 1
      src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue
  16. 1 1
      src/dashoo.cn/frontend_web/src/pages/setting/equipmentmodel/_opera/operation.vue
  17. 2 2
      src/dashoo.cn/frontend_web/src/pages/setting/materialstorehouse/_opera/edit.vue
  18. 1 1
      src/dashoo.cn/frontend_web/src/pages/setting/materialstorehouse/add.vue
  19. 12 12
      src/dashoo.cn/frontend_web/src/pages/signup.vue

+ 4 - 6
src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -133,7 +133,7 @@ module.exports = {
   },
 
   axios: {
-    baseURL: '//localhost:10091/api/'   // 本机开发使用
+    baseURL: '/api/'   // 本机开发使用
     // baseURL: '//47.92.249.239:10092/api/' // 供方管理服务器
   },
   /*
@@ -142,11 +142,9 @@ module.exports = {
   */
   env: {
     appclient: 'gfgl', //供方信息管理平台
-    imgserverhost: 'http://47.92.249.239:10092', // 图片上传地址
-    upfilehost: 'http://weed1.labsop.cn:9333/dir/assign', // 附件上传
-    limsimgserverhost:'http://47.92.249.239:10092',//图片上传
-
-    baseURL: '//localhost:10091/api/' //本地工作流图片
+    //upfilehost: 'http://weed1.labsop.cn:9333/dir/assign', // 附件上传
+    upfilehost: '/uploadfile', // 附件上传
+    baseURL: '/api/' //本地工作流图片
     // baseURL: '//47.92.249.239:10092/api/' //线上工作流图片
   },
   ignore: [

+ 1 - 1
src/dashoo.cn/frontend_web/src/components/oilsupplier/auditfilelist.vue

@@ -384,7 +384,7 @@
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
-              option.action = `http://${res.data.url}/${res.data.fid}`
+              option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               _this.waituploads.push({
                 uid: option.file.uid,
                 url: res.data.publicUrl,

+ 1 - 1
src/dashoo.cn/frontend_web/src/components/oilsupplier/subfilelist.vue

@@ -469,7 +469,7 @@
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
-              option.action = `http://${res.data.url}/${res.data.fid}`
+              option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               _this.waituploads.push({
                 uid: option.file.uid,
                 url: res.data.publicUrl,

+ 5 - 5
src/dashoo.cn/frontend_web/src/components/samples/cellscollectiondialog.vue

@@ -8,7 +8,7 @@
         <el-form-item label="附件说明">
           <el-input type="textarea" v-model="uploadform.UploadDesc" placeholder="附件说明"></el-input>
         </el-form-item>
-        <el-form-item label="附件上传" required> 
+        <el-form-item label="附件上传" required>
           <el-upload style="margin-top: 10px;" multiple action="" ref="refuploadattach" :http-request="uploadrequest" class="attach-uploader"
             :show-file-list="true" :before-upload="beforeAvatarUpload">
             <i class="el-icon-plus attach-uploader-icon"></i>
@@ -111,7 +111,7 @@
       },
       savedata() {
         let _this = this
-        
+
         // 是否有上传附件判断
         if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
           // 上传附件是否完成判断
@@ -157,7 +157,7 @@
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
-              option.action = `http://${res.data.url}/${res.data.fid}`
+              option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               _this.waituploads.push({
                 uid: option.file.uid,
                 url: res.data.publicUrl,
@@ -231,7 +231,7 @@
       },
 
       getDonorsInfoId() {
-        let _this = this 
+        let _this = this
         _this.$axios.get('donors/getIdCardlistId/' + _this.attrinfo.IdCard, {})
           .then(res => {
             _this.uploadform.Id = res.data.items.Id
@@ -243,7 +243,7 @@
           })
 
       },
-      
+
 
 
 

+ 6 - 6
src/dashoo.cn/frontend_web/src/components/samples/maintainlogdialog.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog title="质量管理附件"  :visible.sync="visible" top="5vh" :close-on-click-modal="false" :before-close="closedefore">
-      
+
       <el-form ref="uploadformref" :model="uploadform" label-width="100px">
         <el-form-item label="附件说明">
           <el-input type="textarea" v-model="uploadform.UploadDesc" placeholder="附件说明"></el-input>
@@ -38,7 +38,7 @@
     },
     created() {
       let _this = this
-      
+
     },
     computed: {
       ...mapGetters({
@@ -119,7 +119,7 @@
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
-              option.action = `http://${res.data.url}/${res.data.fid}`
+              option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               _this.waituploads.push({
                 uid: option.file.uid,
                 url: res.data.publicUrl,
@@ -181,9 +181,9 @@
           }
         }
       }
-     
-    
-      
+
+
+
 
 
 

+ 1 - 1
src/dashoo.cn/frontend_web/src/components/samples/protocoldialog.vue

@@ -119,7 +119,7 @@
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
-              option.action = `http://${res.data.url}/${res.data.fid}`
+              option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               _this.waituploads.push({
                 uid: option.file.uid,
                 url: res.data.publicUrl,

+ 1 - 1
src/dashoo.cn/frontend_web/src/components/samples/uploadattachdialog.vue

@@ -151,7 +151,7 @@
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
-              option.action = `http://${res.data.url}/${res.data.fid}`
+              option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               _this.waituploads.push({
                 uid: option.file.uid,
                 url: res.data.publicUrl,

+ 2 - 2
src/dashoo.cn/frontend_web/src/pages/documentmanage/_opera/edit.vue

@@ -322,7 +322,7 @@
         //   //再设置
         //   let v = _this.typeList[i]
         //   switch (v) {
-        //     case "通知公告": _this.uploadform.NoticeTab = 1 
+        //     case "通知公告": _this.uploadform.NoticeTab = 1
         //     break;
         //     case "文件资料": _this.uploadform.DocTab = 1
         //     break;
@@ -371,7 +371,7 @@
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
-              option.action = `http://${res.data.url}/${res.data.fid}`
+              option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               _this.waituploads.push({
                 uid: option.file.uid,
                 url: res.data.publicUrl,

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/documentmanage/_opera/uploadnewdoc.vue

@@ -359,7 +359,7 @@
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
-              option.action = `http://${res.data.url}/${res.data.fid}`
+              option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               _this.waituploads.push({
                 uid: option.file.uid,
                 url: res.data.publicUrl,

+ 2 - 2
src/dashoo.cn/frontend_web/src/pages/documentmanage/add.vue

@@ -278,7 +278,7 @@
               // for (let i = 0; i < _this.uploadform.typeList.length; i++) {
               //   let v = _this.uploadform.typeList[i]
               //   switch (v) {
-              //     case "通知公告": _this.uploadform.NoticeTab = 1 
+              //     case "通知公告": _this.uploadform.NoticeTab = 1
               //     break;
               //     case "文件资料": _this.uploadform.DocTab = 1
               //     break;
@@ -339,7 +339,7 @@
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
-              option.action = `http://${res.data.url}/${res.data.fid}`
+              option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               _this.waituploads.push({
                 uid: option.file.uid,
                 url: res.data.publicUrl,

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/qualchange/_opera/auditoperation.vue

@@ -346,7 +346,7 @@
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
-              option.action = `http://${res.data.url}/${res.data.fid}`
+              option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               _this.waituploads.push({
                 uid: option.file.uid,
                 url: res.data.publicUrl,

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/qualchange/_opera/operation.vue

@@ -450,7 +450,7 @@
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
-              option.action = `http://${res.data.url}/${res.data.fid}`
+              option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               _this.waituploads.push({
                 uid: option.file.uid,
                 url: res.data.publicUrl,

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -587,7 +587,7 @@
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
-              option.action = `http://${res.data.url}/${res.data.fid}`
+              option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               _this.waituploads.push({
                 uid: option.file.uid,
                 url: res.data.publicUrl,

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -689,7 +689,7 @@
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
-              option.action = `http://${res.data.url}/${res.data.fid}`
+              option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               _this.waituploads.push({
                 uid: option.file.uid,
                 url: res.data.publicUrl,

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -662,7 +662,7 @@
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
-              option.action = `http://${res.data.url}/${res.data.fid}`
+              option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               _this.waituploads.push({
                 uid: option.file.uid,
                 url: res.data.publicUrl,

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/setting/equipmentmodel/_opera/operation.vue

@@ -325,7 +325,7 @@
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
-              option.action = `http://${res.data.url}/${res.data.fid}`
+              option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               _this.uploadimg = {
                 uid: option.file.uid,
                 url: res.data.publicUrl,

+ 2 - 2
src/dashoo.cn/frontend_web/src/pages/setting/materialstorehouse/_opera/edit.vue

@@ -257,7 +257,7 @@
           })
           .then(res => {
             _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
-            
+
           })
           .catch(err => {
             // handle error
@@ -294,7 +294,7 @@
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
-              option.action = `http://${res.data.url}/${res.data.fid}`
+              option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               _this.uploadimg = {
                 uid: option.file.uid,
                 url: res.data.publicUrl,

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/setting/materialstorehouse/add.vue

@@ -245,7 +245,7 @@
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
-              option.action = `http://${res.data.url}/${res.data.fid}`
+              option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               _this.uploadimg = {
                 uid: option.file.uid,
                 url: res.data.publicUrl,

+ 12 - 12
src/dashoo.cn/frontend_web/src/pages/signup.vue

@@ -26,7 +26,7 @@
           </el-menu-item> -->
         </el-menu>
       </div>
-      
+
       <el-card>
         <div class="home-wrapper" v-if="activeIndex==1">
             <el-form label-width="135px" ref="formData" :model="formData" :rules="rules">
@@ -43,12 +43,12 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="法定代表人姓名" label-width="150px" style="width: 100%" prop="LegalPerson">
-                    <el-input v-model="formData.LegalPerson"  placeholder="请输入法定代表人姓名"></el-input>           
+                    <el-input v-model="formData.LegalPerson"  placeholder="请输入法定代表人姓名"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="法定代表人身份证号" label-width="150px" style="width: 100%" prop="LegalPersonId">
-                    <el-input v-model="formData.LegalPersonId"  placeholder="请输入法定代表人身份证号"></el-input>           
+                    <el-input v-model="formData.LegalPersonId"  placeholder="请输入法定代表人身份证号"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -67,12 +67,12 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="联系人姓名" label-width="150px" style="width: 100%" prop="ContactName">
-                    <el-input v-model="formData.ContactName"  placeholder="请输入联系人姓名"></el-input>           
+                    <el-input v-model="formData.ContactName"  placeholder="请输入联系人姓名"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="联系人身份证号" label-width="150px" style="width: 100%" prop="ContactId">
-                    <el-input v-model="formData.ContactId"  placeholder="请输入联系人身份证号"></el-input>           
+                    <el-input v-model="formData.ContactId"  placeholder="请输入联系人身份证号"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -106,7 +106,7 @@
                     <el-input v-model="formData.UserTelephone" placeholder="用于审核通知和密码找回"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8">              
+                <el-col :span="8">
                   <el-form-item label="密码" label-width="150px" style="width: 100%" prop="UserPass" >
                     <el-input type="password" v-model="formData.UserPass"  auto-complete="off" placeholder="请输入密码(8-20位,字母数字组合)"></el-input>
                   </el-form-item>
@@ -124,9 +124,9 @@
                   </el-form-item>
                 </el-col>
                 <!-- <el-form-item label="验证码" prop="telep"  style="width: 100%">
-                  </el-form-item>                           
+                  </el-form-item>
                   <el-form-item label="短信验证码" prop="phober"  style="width: 100%">
-                  </el-form-item>             
+                  </el-form-item>
                   <el-checkbox v-model="checked1" style="margin-left: 80px">阅读并同意</el-checkbox>
                 <router-link to="#">《麦吉轮用户注册协议》</router-link><router-link to="#">《隐私政策》</router-link> -->
               </el-row>
@@ -262,7 +262,7 @@
 
         rules: {
           SupplierName: [
-            { required: true, 
+            { required: true,
               validator: checkSupplierName,
               trigger: 'blur'
             }
@@ -307,9 +307,9 @@
             { required: true, message: '请输入密码', trigger: 'blur' }
           ],
           UserPass2: [
-            { required: true, 
+            { required: true,
               message: '请输入确认密码',
-              trigger: 'blur' 
+              trigger: 'blur'
             }
           ],
           CheckUserName: [
@@ -501,7 +501,7 @@
         axios.post(process.env.upfilehost, {})
           .then(function (res) {
             if (res.data && res.data.fid && res.data.fid !== '') {
-              option.action = `http://${res.data.url}/${res.data.fid}`
+              option.action = `http://${res.data.publicUrl}/${res.data.fid}`
               _this.waituploads.push({
                 uid: option.file.uid,
                 url: res.data.publicUrl,