Merge remote-tracking branch 'origin/dev' into dev

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -13,7 +13,7 @@
         </div>
         <el-row style="display: flex; flex-direction: row; align-items: center;">
           <div style="width: 8px; height: 20px; border-radius: 2px; background-color: #bd3124; margin-right: 6px;"></div>
-          <h4>客户资料（必填）</h4>
+          <h4>详情（必填）</h4>
         </el-row>
         <el-row gutter="15">
           <el-col :span="8">
@@ -478,6 +478,12 @@
                 <!-- <el-table-column prop="byId" label="操作人" width="180"/> -->
                 <el-table-column prop="byTime" label="操作时间" width="180" />
                 <el-table-column prop="remarks" label="备注" width="180" />
+                <el-table-column fixed="right" label="操作" width="180">
+                  <template slot-scope="scope">
+                    <el-button type="text" size="small" @click="corpsAttnHandle(scope)">编辑</el-button>
+                    <el-button type="text" size="small" @click="corpsAttnDelete(scope)">删除</el-button>
+                  </template>
+                </el-table-column>
               </el-table>
             </el-tab-pane>
             <el-tab-pane label="发票抬头" name="fptt">
@@ -531,6 +537,12 @@
                   </template>
                 </el-table-column>
                 <el-table-column prop="remarks" label="备注" width="180" />
+                <el-table-column fixed="right" label="操作" width="180">
+                  <template slot-scope="scope">
+                    <el-button type="text" size="small" @click="corpsAttnHandle(scope)">编辑</el-button>
+                    <el-button type="text" size="small" @click="corpsAttnDelete(scope)">删除</el-button>
+                  </template>
+                </el-table-column>
               </el-table>
             </el-tab-pane>
             <!-- <el-tab-pane label="增值税开票" name="zzskp">
@@ -715,7 +727,7 @@
             <el-input v-model="corpsAttnForm.remarks"></el-input>
           </el-form-item>
         </div>
-        <div v-if="activeName == 'bljl'">
+        <div v-if="activeName == 'gmjl'">
           <el-form-item label="原中文名称" prop="oldCnName">
             <el-input v-model="corpsAttnForm.oldCnName"></el-input>
           </el-form-item>
@@ -729,7 +741,8 @@
             <el-input v-model="corpsAttnForm.newEnName"></el-input>
           </el-form-item>
           <el-form-item label="操作时间" prop="byTime">
-            <el-date-picker v-model="corpsAttnForm.byTime" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"
+            <!-- <el-date-picker v-model="corpsAttnForm.byTime" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" -->
+            <el-date-picker v-model="corpsAttnForm.byTime" type="date" placeholder="选择日期"
               :style="{ width: '100%' }">
             </el-date-picker>
           </el-form-item>
@@ -738,12 +751,20 @@
             <el-input v-model="corpsAttnForm.remarks"></el-input>
           </el-form-item>
         </div>
-        <div v-if="activeName == 'gmjl'">
+        <div v-if="activeName == 'bljl'">
           <el-form-item label="原授信等级" prop="oldCreditLevel">
-            <el-input v-model="corpsAttnForm.oldCreditLevel"></el-input>
+            <!-- <el-input v-model="corpsAttnForm.oldCreditLevel"></el-input> -->
+            <el-select v-model="corpsAttnForm.oldCreditLevel" placeholder="请输入信用等级" clearable :style="{ width: '100%' }">
+              <el-option v-for="(item, index) in enterpriseTypeDict" :key="index" :label="item.dictValue"
+                :value="item.dictKey" :disabled="item.disabled"></el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="新授信等级" prop="newCreditLevel">
-            <el-input v-model="corpsAttnForm.newCreditLevel"></el-input>
+            <!-- <el-input v-model="corpsAttnForm.newCreditLevel"></el-input> -->
+            <el-select v-model="corpsAttnForm.newCreditLevel" placeholder="请输入信用等级" clearable :style="{ width: '100%' }">
+              <el-option v-for="(item, index) in enterpriseTypeDict" :key="index" :label="item.dictValue"
+                :value="item.dictKey" :disabled="item.disabled"></el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="状态" prop="status">
             <el-select v-model="corpsAttnForm.status" placeholder="请选择状态" :style="{ width: '100%' }">
@@ -827,6 +848,9 @@ export default {
         corpsAttnList: [],
         corpsBankList: [],
         corpsFilesList: [],
+        corpsInvoiceHeaderList: [],
+        corpsRenameList: [],
+        corpsBadrecordList: []
       },
       // rules: {
       //   corpType: [{
@@ -1042,7 +1066,7 @@ export default {
     },
     rateChange(value) {
       this.corpsAttnForm.curId = value
-      for (let item of this.unitNoData) {
+      for (let item of this.rateOptions) {
         if (item.id == value) {
           this.corpsAttnForm.curNo = item.cnName
         }
@@ -1105,6 +1129,10 @@ export default {
         this.dialogTitle = "附件"
       } else if (this.activeName == 'fptt') {
         this.dialogTitle = "发票抬头"
+      } else if (this.activeName == 'gmjl') {
+        this.dialogTitle = "更名记录"
+      } else if (this.activeName == 'bljl') {
+        this.dialogTitle = "不良记录"
       }
     },
     // 确认
@@ -1138,6 +1166,10 @@ export default {
             this.formData.corpsFilesList.push(this.corpsAttnForm);
           } else if (this.activeName == 'fptt') {
             this.formData.corpsInvoiceHeaderList.push(this.corpsAttnForm);
+          } else if (this.activeName == 'gmjl') {
+            this.formData.corpsRenameList.push(this.corpsAttnForm);
+          } else if (this.activeName == 'bljl') {
+            this.formData.corpsBadrecordList.push(this.corpsAttnForm);
           }
           // }
           this.corpsAttnForm = {};
@@ -1169,6 +1201,10 @@ export default {
           this.formData.corpsFilesList[this.corpsAttnDialogIndex] = this.corpsAttnForm
         } else if (this.activeName == 'fptt') {
           this.formData.corpsInvoiceHeaderList[this.corpsAttnDialogIndex] = this.corpsAttnForm
+        } else if (this.activeName == 'gmjl') {
+          this.formData.corpsRenameList[this.corpsAttnDialogIndex] = this.corpsAttnForm
+        } else if (this.activeName == 'bljl') {
+          this.formData.corpsBadrecordList[this.corpsAttnDialogIndex] = this.corpsAttnForm
         }
         // }
         this.corpsAttnForm = {};
@@ -1208,6 +1244,10 @@ export default {
           this.formData.corpsFilesList.splice(scope.$index, 1)
         } else if (this.activeName == 'fptt') {
           this.formData.corpsInvoiceHeaderList.splice(scope.$index, 1)
+        } else if (this.activeName == 'gmjl') {
+          this.formData.corpsRenameList.splice(scope.$index, 1)
+        } else if (this.activeName == 'bljl') {
+          this.formData.corpsBadrecordList.splice(scope.$index, 1)
         }
         // }
         this.$message({
@@ -1267,6 +1307,8 @@ export default {
         corpsAttnList: [],
         corpsBankList: [],
         corpsFilesList: [],
+        corpsInvoiceHeaderList: [],
+        corpsRenameList: [],
       }
       this.detailData = {}
       this.corpsAttnForm = {}

src/views/iosBasicData/bcorps/index.vue

@@ -260,7 +260,7 @@ export default {
         index: true,
         viewBtn: true,
         selection: true,
-        addBtnText: '新建客户',
+        addBtnText: '新建往来单位',
         dialogClickModal: false,
         column: [
           {