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

src/views/customers/citypotenial-list/index.vue

@@ -30,7 +30,7 @@
                        :value="item.ExtAgentID_SDK" />
           </el-select>
           <el-input v-else
-                     type="textarea"
+                    type="textarea"
                     v-model="formData.ExtLockRspName_SDK"
                     disabled>
           </el-input>
@@ -79,14 +79,11 @@
         <el-table :data="tableData2"
                   border
                   style="width: 100%">
-          <el-table-column prop="FileName"
-                           label="附件名称">
-          </el-table-column>
           <el-table-column prop="CreateOn_SDK"
-                           label="上传日期">
+                           label="创建时间">
           </el-table-column>
-          <el-table-column prop="CreateName_SDK"
-                           label="操作者">
+          <el-table-column prop="FileName"
+                           label="文件名">
           </el-table-column>
           <el-table-column label="操作">
             <el-link slot-scope="{ row }"
@@ -285,7 +282,7 @@ export default {
               type: 'input',
               layout: 12,
               disabled: true,
-               break:true,
+              break: true,
               label: 'Unis业务负责人姓名'
             },
             ExtUnisPhone_SDK: {
@@ -385,7 +382,7 @@ export default {
         this.formData = resp.results[0]
         if (this.formData.ExtProcessNode_SDK == 4) {
           if (!this.formData.ExtRegisteredCapital_SDK) {
-             this.isEdit = false
+            this.isEdit = false
           }
         }
         if (this.formData.ExtProcessNode_SDK == 2) {
@@ -452,7 +449,7 @@ export default {
       } else if (this.formData.ExtProcessNode_SDK == 4) {
         if (!this.formData.ExtRegisteredCapital_SDK) {
           return this.$message.warning('请输入注册资金')
-        }else{
+        } else {
           this.dialogFormVisible = true
           this.status = 1
         }

src/views/customers/potential-list/index.vue

@@ -31,7 +31,7 @@
                        :value="item.Code" />
           </el-select>
           <el-input v-else
-                     type="textarea"
+                    type="textarea"
                     v-model="formData.ExtLockCityName_SDK"
                     disabled>
           </el-input>
@@ -42,15 +42,13 @@
         <el-table :data="tableData2"
                   border
                   style="width: 100%">
-          <el-table-column prop="FileName"
-                           label="附件名称">
-          </el-table-column>
           <el-table-column prop="CreateOn_SDK"
-                           label="上传日期">
+                           label="创建时间">
           </el-table-column>
-          <el-table-column prop="CreateName_SDK"
-                           label="操作者">
+          <el-table-column prop="FileName"
+                           label="文件名">
           </el-table-column>
+
           <el-table-column label="操作">
             <el-link slot-scope="{ row }"
                      type="primary"
@@ -247,7 +245,7 @@ export default {
               type: 'input',
               layout: 12,
               disabled: true,
-              break:true,
+              break: true,
               label: 'Unis业务负责人姓名'
             },
             ExtUnisPhone_SDK: {
@@ -266,7 +264,7 @@ export default {
               type: 'input',
               layout: 12,
               disabled: true,
-               break:true,
+              break: true,
               label: '商务负责人姓名'
             },
             ExtBusinessPhone_SDK: {
@@ -398,13 +396,13 @@ export default {
       } else if (this.formData.ExtProcessNode_SDK == 5) {
         if (!this.formData.ExtRegisteredCapital_SDK) {
           return this.$message.warning('请输入注册资金')
-        }else{
+        } else {
           this.dialogFormVisible = true
           this.status = 1
         }
       } else {
-         this.dialogFormVisible = true
-          this.status = 1
+        this.dialogFormVisible = true
+        this.status = 1
       }
 
     },

src/views/login/prov-register/index.vue

@@ -492,6 +492,7 @@ export default {
       },
       dialogTableVisible: false,
       isShow: true,
+      formDataList:{},
       TotalRecords: 0,
       page: {
         pageSize: 10,
@@ -598,8 +599,8 @@ export default {
           }
         })
       })
-      this.formData.extProductGroup_SDK = cont//获取的 name
-      this.formData.extProductGroup_KUT = val//获取的 id
+      this.formDataList.extProductGroup_SDK = cont
+      this.formDataList.extProductGroup_KUT = val
     },
     handSelect3(value) {
       let cont = []
@@ -612,8 +613,8 @@ export default {
           }
         })
       })
-      this.formData.extTotalAgent_SDK = cont//获取的 name
-      this.formData.extTotalAgent_KUT = val//获取的 id
+      this.formDataList.extTotalAgent_SDK = cont
+      this.formDataList.extTotalAgent_KUT = val
     },
 
     createLovTable() {
@@ -637,10 +638,10 @@ export default {
         if (valid) {
           this.formData.extCustomerType_SDK = 101
           let dataList=this.formData
-          const ExtProductGroup_KUT = this.formData.extProductGroup_KUT
-          const ExtProductGroup_SDK = this.formData.extProductGroup_SDK
-          const ExtTotalAgent_KUT = this.formData.extTotalAgent_KUT
-          const ExtTotalAgent_SDK = this.formData.extTotalAgent_SDK
+          const ExtProductGroup_KUT = this.formDataList.extProductGroup_KUT
+          const ExtProductGroup_SDK = this.formDataList.extProductGroup_SDK
+          const ExtTotalAgent_KUT = this.formDataList.extTotalAgent_KUT
+          const ExtTotalAgent_SDK = this.formDataList.extTotalAgent_SDK
           dataList.extProductGroup_KUT = ExtProductGroup_KUT.toString()
           dataList.extProductGroup_SDK = ExtProductGroup_SDK.toString()
           dataList.extTotalAgent_KUT = ExtTotalAgent_KUT.toString()
@@ -649,9 +650,14 @@ export default {
           this.$request(Customer.searchUrl, this.paramsToFormData(dataList)).then((resp) => {
             this.btnloading = false
             this.$message.success('提交成功！')
+            this.formData.extProductGroup_KUT=this.formData.extProductGroup_KUT.split(',')
+            this.formData.extTotalAgent_KUT=this.formData.extTotalAgent_KUT.split(',')
+             console.log(this.formData)
             this.isShow = false
           }).catch((err) => {
             this.btnloading = false
+            this.formData.extProductGroup_KUT=this.formData.extProductGroup_KUT.split(',')
+            this.formData.extTotalAgent_KUT=this.formData.extTotalAgent_KUT.split(',')
           })
         } else {
           this.btnloading = false

src/views/models/all-models.vue

@@ -8,9 +8,9 @@
           <el-table-column prop="FileName"
                            label="名称">
           </el-table-column>
-          <el-table-column prop="CreateOn_SDK"
+          <!-- <el-table-column prop="CreateOn_SDK"
                            label="时间">
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column 
                            label="操作">
           <el-link  slot-scope="{ row }"  type="primary" @click="btnLink(row)">下载</el-link>

src/views/models/city-models.vue

@@ -8,9 +8,9 @@
           <el-table-column prop="FileName"
                            label="名称">
           </el-table-column>
-          <el-table-column prop="CreateOn_SDK"
+          <!-- <el-table-column prop="CreateOn_SDK"
                            label="时间">
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column 
                            label="操作">
           <el-link  slot-scope="{ row }"  type="primary" @click="btnLink(row)">下载</el-link>

src/views/models/prov-models.vue

@@ -8,9 +8,9 @@
           <el-table-column prop="FileName"
                            label="名称">
           </el-table-column>
-          <el-table-column prop="CreateOn_SDK"
+          <!-- <el-table-column prop="CreateOn_SDK"
                            label="时间">
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column 
                            label="操作">
           <el-link  slot-scope="{ row }"  type="primary" @click="btnLink(row)">下载</el-link>

src/views/models/total-models.vue

@@ -8,9 +8,9 @@
           <el-table-column prop="FileName"
                            label="名称">
           </el-table-column>
-          <el-table-column prop="CreateOn_SDK"
+          <!-- <el-table-column prop="CreateOn_SDK"
                            label="时间">
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column 
                            label="操作">
           <el-link  slot-scope="{ row }"  type="primary" @click="btnLink(row)">下载</el-link>