Merge branch 'master' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -245,8 +245,8 @@
                       @click="insuranceFactor(schemeindex, productCostsindex, '3')">保费因子</el-button>
                     <el-button type="warning" :size="overSize"
                       @click="otherFactor(schemeindex, productCostsindex, '4')">其他因子</el-button>
-                    <el-button type="warning" :size="overSize"
-                      @click="wholeFactor(schemeindex, productCostsindex)">全部因子</el-button>
+                    <!-- <el-button type="warning" :size="overSize"
+                      @click="wholeFactor(schemeindex, productCostsindex)">全部因子</el-button> -->
                     <el-button v-if="productCostsindex != 0" type="danger" :size="overSize"
                       @click="deleteproductCosts(productCostsindex)">删除方案</el-button>
                   </div>
@@ -1497,7 +1497,7 @@
         <el-button :size="overSize" type="primary" @click="otherFactorsubmit()">保存</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="全部因子" :visible.sync="wholeVisible" width="50%">
+    <!-- <el-dialog title="全部因子" :visible.sync="wholeVisible" width="50%">
       <div class="flex f-c products" style="padding: 0 20px;">
         <div class="productstitle flex j-s">
           <div><span>车辆因子</span></div>
@@ -1832,7 +1832,7 @@
         <el-button :size="overSize" @click="wholeVisible = false">取 消</el-button>
         <el-button :size="overSize" type="primary" @click="otherFactorsubmit()">保存</el-button>
       </span>
-    </el-dialog>
+    </el-dialog> -->
 
   </div>
 </template>
@@ -2130,9 +2130,6 @@ export default {
           rulesType: "1",
         }
       ],
-      //==============================
-      checkList: [],
-      //==============================
       peopleid: "",
       peopledeptid: "",
 
@@ -2245,7 +2242,6 @@ export default {
       operType: "ADD", //'ADD','EDIT'
       dialogTitle: "新增协议",
       attributionformRules: {
-
         username: [
           { required: true, message: "请输入账号", trigger: "blur" },
         ],

src/views/Esm/Esmcompany.vue

@@ -44,9 +44,9 @@
           </el-table-column>
           <el-table-column prop="type" label="保司类型">
             <template slot-scope="scope">
-              <el-tag  v-if="scope.row.type == '0'"  size="small">渠道</el-tag>
-              <el-tag  v-if="scope.row.type == '1'" type="danger" size="small">财险</el-tag>
-              <el-tag  v-if="scope.row.type == '2'" type="warning" size="small">寿险</el-tag>
+              <el-tag v-if="scope.row.type == '0'" size="small">渠道</el-tag>
+              <el-tag v-if="scope.row.type == '1'" type="danger" size="small">财险</el-tag>
+              <el-tag v-if="scope.row.type == '2'" type="warning" size="small">寿险</el-tag>
             </template>
           </el-table-column>
           <!-- <el-table-column prop="address" label="状态" width="180">
@@ -308,7 +308,6 @@ export default {
           { required: true, message: "请输入供应商简称", trigger: "blur" },
         ],
       },
-
       areaList: citydata.rawCitiesData,
       area: [],
       optionProps: {
@@ -356,7 +355,7 @@ export default {
   methods: {
     typeOptionsChange(e) {
       this.type = e;
-      this.dataForm.id = e + '000000'
+      this.dataForm.id = this.dataForm.code + e + '000000'
     },
     // 搜索
     searchInfor() {
@@ -470,7 +469,6 @@ export default {
         .then(data != null ? data.callback : "");
     },
     areaHandleChange(value) {
-      console.log(value)
       if (value != "") {
         this.dataForm.id =
           this.dataForm.parentId.substring(0, 4) + this.dataForm.type + value[value.length - 1];
@@ -578,7 +576,6 @@ export default {
     },
     //提交确认
     submitForm(formName) {
-      console.log(this.dataForm, 1111111)
       this.$refs[formName].validate((valid) => {
         if (valid) {
           if (this.operType == "ADD1" || this.operType == "ADD2" || this.operType == "ADD3") {
@@ -595,7 +592,6 @@ export default {
             this.$refs.dataForm.validate((valid) => {
               // 新增保险总公司和分公司
               this.$api.insCompany.addCompany(this.dataForm).then((res) => {
-                console.log(res);
                 if (res.code == 200) {
                   this.findLeftTreeData();
                   this.$message({ message: "添加成功", type: "success" });
@@ -611,12 +607,11 @@ export default {
           } else {
             //修改信息
             this.$api.insCompany.editCompany(this.dataForm).then((res) => {
-              console.log(res);
               if (res.code == 200) {
                 this.findLeftTreeData();
                 this.$message({ message: "编辑成功", type: "success" });
               } else {
-                this.$message({ message: "编辑失败", type: "error" });
+                this.$message({ message: res.msg, type: "error" });
               }
               this.dialogVisible = false;
             });
@@ -624,14 +619,6 @@ export default {
         }
       });
     },
-    // 关闭新增对话框
-    // handleClose(done) {
-    //   this.$confirm("确认关闭？", { lockScroll: false })
-    //     .then((_) => {
-    //       done();
-    //     })
-    //     .catch((_) => {});
-    // },
     closeVisible() {
       this.$refs.dataForm.resetFields();
       for (let key in this.dataForm) {