Merge branch 'dev' of http://39.101.143.165:8090/sxzgd/vue-insagent-pc into dev

src/views/Sys/Deptall.vue

@@ -314,10 +314,18 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="排序" prop="orderNum">
-              <el-input-number v-model="deptDataForm.orderNum" placeholder="排序" controls-position="right"
-                :min="0"></el-input-number>
-            </el-form-item>
+              <el-form-item label="排序" prop="orderNum">
+                  <el-input-number v-model="deptDataForm.orderNum" placeholder="排序" controls-position="right"
+                                   :min="0"></el-input-number>
+              </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="currentTreeNode && currentTreeNode.comlevel == '5' && currentTreeNode.managementSource == '2'">
+              <el-form-item label="新合伙人" prop="isPartner">
+                  <el-select v-model="deptDataForm.isPartner" style="width: 100%">
+                      <el-option label="是" value="1"></el-option>
+                      <el-option label="否" value="0"></el-option>
+                  </el-select>
+              </el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -592,6 +600,7 @@ export default {
       deptDataForm: {
         deptType: "D",
         orderNum: 0,
+        isPartner: '0',
         name: "",
         address: "",
       },
@@ -659,6 +668,7 @@ export default {
     },
     //点击每一行的事件
     rowClick(row, treeNode) {
+        console.log('点击的是:', row)
       //点每行展开折叠
       if (row.expanded === undefined) {
         row.expanded = false;

src/views/Task/daikeComponents/KtLetter1.vue

@@ -1425,7 +1425,7 @@ agreementitem, agreementindex
                         </div>
 
                     </div>
-                    <div class="card-table" v-show="reslistitem.cnName == 'renshou'
+                      <div class="card-table" v-show="reslistitem.cnName == 'renshou'
                   // || reslistitem.cnName == 'taishan'
                   ">
                       <div class="table-title">其他</div>
@@ -6886,8 +6886,6 @@ export default {
     // 获取方案信息
     getCompanyProgramme(e, code, name, index) {
       this.totalCompanyList[index].checked = false;
-      console.log(e, code, name, index)
-      console.log('this.totalCompanyList[index]', this.totalCompanyList[index])
       this.$api.letter
         .getAllSchemeList({
           companyId: code,
@@ -10124,6 +10122,7 @@ export default {
             })
             .catch(() => { });
         } else {
+            alert(11111111)
           this.$message({ message: res.msg, type: "warning" });
         }
       });
@@ -10776,8 +10775,6 @@ export default {
           }
           this.totalCompanyList[num].quoteCode = 200;
           this.totalCompanyList[num].result = res.data;
-            console.log('报价结果', res.data)
-            console.log('报价公司', this.totalCompanyList[num])
           this.totalCompanyList[num].pricingCoefficient = res.data.pricingCoefficient
           this.totalCompanyList[num].pricingCoefficientUpper = res.data.pricingCoefficientUpper
           this.totalCompanyList[num].pricingCoefficientLower = res.data.pricingCoefficientLower
@@ -11183,7 +11180,6 @@ export default {
       if(namesimple == "恒邦财险") {
           params.coefficient = this.totalCompanyList[num].coefficient
       }
-      console.log('this.totalCompanyList[num]', this.totalCompanyList[num])
       if (namesimple == "中国人寿" && this.lastCompanyId) {
         params.discount = this.totalCompanyList[num].discount;
         params.lastCompanyId = this.lastCompanyId;
@@ -11257,7 +11253,7 @@ export default {
               return;
             }
             break;
-          case "众安平安":
+          case "众安财险":
             if (!!res.data) {
               if (res.data.tips == "需要验车") {
                 this.$notify.error({