Merge branch 'dev' of http://120.25.63.219:6088/rex/portalhtml into dev

src/components/EleForm/components/EleFormSelect.vue

@@ -68,30 +68,30 @@ export default {
   },
   methods: {
     // 变化处理
-    handleChange(value) {
-      var result = {}
-      if (!this.attrs.multiple) {
-        this.options.forEach(item => {
-          if (item.value === value) {
-            result = item
-          }
-        })
-      } else {
-        result = {
-          value: [],
-          text: []
-        }
-        this.options.forEach(item => {
-          value.forEach(jtem => {
-            if (item.value === jtem) {
-              result.value.push(item.value)
-              result.text.push(item.text)
-            }
-          })
-        })
-      }
-      this.$emit('input', result)
-    },
+    // handleChange(value) {
+    //   var result = {}
+    //   if (!this.attrs.multiple) {
+    //     this.options.forEach(item => {
+    //       if (item.value === value) {
+    //         result = item.value
+    //       }
+    //     })
+    //   } else {
+    //     result = {
+    //       value: [],
+    //       text: []
+    //     }
+    //     this.options.forEach(item => {
+    //       value.forEach(jtem => {
+    //         if (item.value === jtem) {
+    //           result.value.push(item.value)
+    //           result.text.push(item.text)
+    //         }
+    //       })
+    //     })
+    //   }
+    //   this.$emit('input', result)
+    // },
     changeOptions(q) {
       if (this.remoteMethod) {
         this.loading = true

src/views/customers/customers-add/index.vue

@@ -55,6 +55,7 @@ export default {
               code: 'qcc',
               displayKey:'Name',
               btnTitle: '获取企查查信息',
+              disabled:false,
               returnFn: function(row) {
                 return {
                   Name: row.Name,
@@ -67,6 +68,7 @@ export default {
               type: 'input',
               label: '公司全称曾用名',
               layout: 12,
+              disabled:false,
             },
             ExtSocialUnifiedCreditCode_SDK: {
               type: 'input',
@@ -111,6 +113,7 @@ export default {
                 })
                 return result
               },
+              disabled:false,
             },
             ExtCity_SDK: {
               type: 'select',
@@ -123,7 +126,7 @@ export default {
                   return []
                 }
                 const res = await citySearch({
-                  provinceCode: data.ExtProvince_SDK.value
+                  provinceCode: data.ExtProvince_SDK
                 })
                 var result = res.results.map(item => {
                   return {
@@ -133,6 +136,7 @@ export default {
                 })
                 return result
               },
+              disabled:false,
             },
             ExtDistrict_SDK: {
               type: 'select',
@@ -145,7 +149,7 @@ export default {
                   return []
                 }
                 const res = await districtSearch({
-                  cityCode: data.ExtCity_SDK.value
+                  cityCode: data.ExtCity_SDK
                 })
                 var result = res.results.map(item => {
                   return {
@@ -155,11 +159,13 @@ export default {
                 })
                 return result
               },
+              disabled:false,
             },
             ExtAddressDetail_SDK: {
               type: 'input',
               label: '详细经营地址',
               layout: 12,
+              disabled:false,
             },
           }
         },
@@ -169,47 +175,56 @@ export default {
             ExtLeader_SDK: {
               type: 'input',
               label: '公司负责人姓名',
-              layout: 12
+              layout: 12,
+              disabled:false,
             },
             ExtLeaderPhone_SDK: {
               type: 'input',
               label: '公司负责人联系方式',
-              layout: 12
+              layout: 12,
+              disabled:false,
             },
             ExtLeaderEmail_SDK: {
               type: 'input',
               label: '公司负责人邮箱',
-              layout: 12
+              layout: 12,
+              disabled:false,
             },
             ExtUnis_SDK: {
               type: 'input',
               layout: 12,
-              label: 'Unis业务负责人姓名'
+              label: 'Unis业务负责人姓名',
+              disabled:false,
             },
             ExtUnisPhone_SDK: {
               type: 'input',
               layout: 12,
-              label: 'Unis业务负责人联系方式'
+              label: 'Unis业务负责人联系方式',
+              disabled:false,
             },
             ExtUnisEmail_SDK: {
               type: 'input',
               label: 'Unis业务负责人邮箱',
-              layout: 12
+              layout: 12,
+              disabled:false,
             },
             ExtBusiness_SDK: {
               type: 'input',
               layout: 12,
-              label: '商务负责人姓名'
+              label: '商务负责人姓名',
+              disabled:false,
             },
             ExtBusinessPhone_SDK: {
               type: 'input',
               layout: 12,
-              label: '商务负责人联系方式'
+              label: '商务负责人联系方式',
+              disabled:false,
             },
             ExtBusinessEmail_SDK: {
               type: 'input',
               label: '商务负责人邮箱',
-              layout: 12
+              layout: 12,
+              disabled:false,
             },
           }
         }

src/views/customers/customers-details/area.vue

@@ -21,7 +21,10 @@
         认  证
       </el-button>
     </div>
-    <PersonalInFo :addBtnStart='addBtnStart' :dedeleBtnStart="dedeleBtnStart" :type-code="typeCode" :isShowEditBtn='btn'/>
+    <div>
+      <PersonalInFo :addBtnStart='addBtnStart' :dedeleBtnStart="dedeleBtnStart" :type-code="typeCode" :isShowBtn='isShowBtn' :isShowEditBtn="isShowEditBtn"/>
+    </div>
+    <!-- <PersonalInFo :addBtnStart='addBtnStart' :dedeleBtnStart="dedeleBtnStart" :type-code="typeCode" :isShowEditBtn='btn'/> -->
   </div>
 </template>
 
@@ -51,7 +54,8 @@ export default {
       title: '城市代理商详情',
       addBtnStart: true,
       dedeleBtnStart: true,
-      btn:false,
+      isShowBtn:true,
+      isShowEditBtn: false,
       objectID: '',
       btnStart: true,
       formData: {},
@@ -244,7 +248,7 @@ export default {
         {
           title: "签约信息",
           formDesc: {
-            ExtChannelType_SDK: {
+            ExtChannelType_SDKText: {
               type: 'input',
               label: '签约渠道类型',
               layout: 12,

src/views/customers/customers-details/index.vue

@@ -232,7 +232,7 @@ export default {
         {
           title: "签约信息",
           formDesc: {
-            ExtChannelType_SDK: {
+            ExtChannelType_SDKText: {
               type: 'input',
               label: '签约渠道类型',
               layout: 12,

src/views/customers/customers-details/province.vue

@@ -232,11 +232,12 @@ export default {
         {
           title: "签约信息",
           formDesc: {
-            ExtChannelType_SDK: {
+            ExtChannelType_SDKText: {
               type: 'input',
               label: '签约渠道类型',
               layout: 12,
-              disabled: true
+              disabled: true,
+              // value: 'ExtChannelType_SDKText'
             },
             ExtLockRsp_SDK: {
               type: 'input',

src/views/customers/personal-customers/conponents/personal-info/index.vue

@@ -94,6 +94,10 @@ export default {
     dedeleBtnStart: {
       type: Boolean,
       default: true,
+    },
+    isShowBtn: {
+      type: Boolean,
+      default: true,
     }
   },
   data() {
@@ -115,18 +119,30 @@ export default {
     }
   },
   watch: {
-    isShowEditBtn(val) {
-      this.tableConfig.columns.handle.vif = val
+    isShowEditBtn: {
+      handler(val){},
+      deep: true,
+      immediate: true
+      // this.tableConfig.columns.handle.vif = val
+    },
+    addBtnStart: {
+      handler(val){},
+      deep: true,
+      immediate: true,
     },
-    btnStart: {
+    dedeleBtnStart: {
+      handler(val){},
+      deep: true,
+      immediate: true,
+    },
+    isShowBtn: {
       handler(val){},
       deep: true,
       immediate: true,
     }
-
   },
   created() {
-    this.tableConfig.columns.handle.vif = this.isShowEditBtn
+    this.tableConfig.columns.handle.vif = this.isShowBtn
     constant.tableConfig.initialParams = {
       BusinessObjectID: this.objectID || this.$route.query.objectID,
       TypeCode: this.typeCode
@@ -190,11 +206,11 @@ export default {
       if (!this.formData.ObjectID) {
         const businessObjectID =
           this.$route.query.objectID || this.tableConfig.initialParams.objectID
+        console.log(businessObjectID)
         formData.append('businessObjectID', businessObjectID)
         formData.delete('objectID')
         this.loading = true
-        this.$request(file.createUrl, formData).then(res => {
-          console.log(res)
+        this.$request(file.createUrl, formData).then(() => {
           this.loading = false
           this.dialogFormVisible = false
           this.fileList = []
@@ -203,7 +219,6 @@ export default {
           this.$refs.eleTable.handleSearch()
         }).catch(() => {
           this.loading = false
-          // this.tableConfig.url = file.searchUrl
         })
       } else {
         formData.append('typeCode', this.typeCode)

src/views/customers/personal-customers/index.vue

@@ -231,7 +231,7 @@ export default {
         {
           title: "签约信息",
           formDesc: {
-            ExtChannelType_SDK: {
+            ExtChannelType_SDKText: {
               type: 'input',
               label: '签约渠道类型',
               layout: 12,
@@ -309,16 +309,21 @@ export default {
         });
       return formData;
     },
-    getOneData() {
-      const dataId =  JSON.parse(localStorage.getItem('USERINFO')).ExtCustomerObjectID_SDK
-      this.$router.push({
-        path: '/Personal-customers',
-        query: { objectID: dataId}
-      })   
-      customerGetOne({ objectID: dataId }).then(res => {
+    async getOneData() {
+      // const dataId = await JSON.parse(localStorage.getItem('USERINFO')).ExtCustomerObjectID_SDK
+      // console.log(dataId)
+      // this.$router.push({
+      //   path: '/Personal-customers',
+      //   query: { objectID: JSON.parse(localStorage.getItem('USERINFO')).ExtCustomerObjectID_SDK}
+      // })
+      customerGetOne({ objectID: JSON.parse(localStorage.getItem('USERINFO')).ExtCustomerObjectID_SDK }).then(res => {
         this.formData = res.results[0]
         this.addBtnStart = false
         this.dedeleBtnStart = false
+        this.$router.push({
+          path: '/Personal-customers',
+          query: { objectID: JSON.parse(localStorage.getItem('USERINFO')).ExtCustomerObjectID_SDK}
+        })
       })
     }
   }

src/views/public/file-info/index.vue

@@ -37,6 +37,7 @@
           <upload-btn
             :objectID="formData.ObjectID"
             :fileDetails="formData.FileDetails"
+            :file-list="fileList"
             @change="changeFileList"
           />
         </template>
@@ -187,15 +188,12 @@ export default {
         this.$request(file.createUrl, formData).then(() => {
           this.loading = false
           this.dialogFormVisible = false
+          this.fileList = []
           this.$message.success('添加成功！')
-          // this.tableConfig.url = file.searchUrl
-          // console.log(this.$refs.eleTable.url)
           this.$refs.eleTable.url = file.searchUrl
-          // this.url = file.searchUrl
           this.$refs.eleTable.handleSearch()
         }).catch(() => {
           this.loading = false
-          // this.tableConfig.url = file.searchUrl
         })
       } else {
         formData.append('typeCode', this.typeCode)

src/views/public/file-info/upload-btn.vue

@@ -13,11 +13,11 @@
     >
       <el-button size="small" type="primary">上传文件</el-button>
     </el-upload>
-    <upload-list
+    <!-- <upload-list
       v-if="objectID"
       v-bind="config"
       :files="fileDetails"
-      @remove="handleRemoveReq" />
+      @remove="handleRemoveReq" /> -->
   </div>
 </template>
 
@@ -48,22 +48,33 @@ export default {
       default: true
     },
     // 已上传到服务器的文件列表
-    fileDetails: {
-      type: Array,
-      default: function() {
-        return []
-      }
-    },
+    // fileDetails: {
+    //   type: Array,
+    //   default: function() {
+    //     return []
+    //   }
+    // },
     config: {
       type: Object,
       default: function() {
         return {}
       }
+    },
+    fileList: {
+      type: Array,
+      default: function() {
+        return []
+      }
     }
   },
   data() {
-    return {
-      fileList: [],
+    return {}
+  },
+  watch: {
+    fileList: {
+      handler(newVal){},
+      deep: true,
+      immediate: true
     }
   },
   created() {
@@ -80,13 +91,13 @@ export default {
       this.$emit('change', fileList)
     },
     // 删除文件
-    handleRemoveReq(index, item) {
-      this.$request(file.deleteDetailUrl, [{ objectID: item.ObjectID }]).then(() => {
-          this.$message.success('删除成功！')
-          this.fileDetails.splice(index, 1)
-        }
-      )
-    }
+    // handleRemoveReq(index, item) {
+    //   this.$request(file.deleteDetailUrl, [{ objectID: item.ObjectID }]).then(() => {
+    //       this.$message.success('删除成功！')
+    //       this.fileDetails.splice(index, 1)
+    //     }
+    //   )
+    // }
   }
 }
 </script>