Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/PlatformAccount/index.vue

@@ -381,11 +381,6 @@
               <el-input v-model="addMsg.Bond" maxlength="20"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4" :gutter="35">
-            <el-form-item :label="$t('fnc.qyxianlu')">
-              <el-input v-model="addMsg.SigningLine" class></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="4" :gutter="35">
             <el-form-item :label="$t('fnc.hetong')">
               <el-select filterable v-model="addMsg.HaveContract" class>
@@ -417,50 +412,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="4" :gutter="35">
-                            <el-form-item label="收款负责人：" prop="InCharge" class="_fuzeren">
-                                <el-select
-                                    v-model="addMsg.InCharge"
-                                    filterable
-                                    remote
-                                    reserve-keyword
-                                    placeholder="请输入关键词"
-                                    :remote-method="remoteMethod"
-                                    @focus="Charge=1"
-                                    :loading="loading2">
-                                    <el-option
-                                        v-for="item in showEmployeeList"
-                                        :key="item.empId"
-                                        :label="`${item.name}`"
-                                        :value="item.empId">
-                                        <span style="float: left; font-size: 12px">{{ item.name }}</span>
-                                        <span style="float: right; font-size: 12px; margin-right:20px;">{{ item.departmentName }}</span>
-                                    </el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="4" :gutter="35">
-                            <el-form-item label="支款负责人：" prop="OutCharge" class="_fuzeren">
-                                <el-select
-                                    v-model="addMsg.OutCharge"
-                                    filterable
-                                    remote
-                                    reserve-keyword
-                                    placeholder="请输入关键词"
-                                    :remote-method="remoteMethod2"
-                                    @focus="Charge=2"
-                                    :loading="loading2">
-                                    <el-option
-                                        v-for="item in showEmployeeList2"
-                                        :key="item.empId"
-                                        :label="`${item.name}`"
-                                        :value="item.empId">
-                                        <span style="float: left; font-size: 12px">{{ item.name }}</span>
-                                        <span style="float: right; font-size: 12px; margin-right:20px;">{{ item.departmentName }}</span>
-                                    </el-option>
-                                </el-select>
-                            </el-form-item>
-          </el-col>-->
           <el-col :span="4" :gutter="35" class="_BranchIdS">
             <el-form-item :label="$t('fnc.ssgongsi')" prop="BranchIdS">
               <el-select filterable v-model="addMsg.BranchIdS" collapse-tags>
@@ -619,7 +570,7 @@
           SigningLine: "",
           Accountholder: ""
         },
-        LineId: ['-1'],
+        LineId: [-1],
         SettlementType: ['1'],
         addMsg: {
           ID: 0,
@@ -821,7 +772,7 @@
         this.addMsg.SigningLine = data
         if(this.LineId.length>1&&data.indexOf('-1')!=-1){
           this.LineId.forEach((x,index)=>{
-            if(x=='-1'){
+            if(x==-1){
               this.LineId.splice(index,1)
             }
           })
@@ -1311,9 +1262,20 @@
               this.remoteMethod(data.InemName);
               this.remoteMethod2(data.OutemName);
               this.addMsg = data;
-              let SigningLine = this.addMsg.SigningLine.slice(',')
-              this.LineId = SigningLine.length==1&&SigningLine[0]=='0'?['-1']:SigningLine
-              this.SettlementType = this.addMsg.SettlementType.slice(',')
+              //let SigningLine = this.addMsg.SigningLine.slice(',')
+              //this.LineId = SigningLine.length==1&&SigningLine[0]=='0'?['-1']:SigningLine
+              //this.SettlementType = this.addMsg.SettlementType.slice(',')
+              this.LineId =[];
+              let SigningLine = this.addMsg.SigningLine.split(',')
+              if(SigningLine.length==1&&SigningLine[0]=='0'){
+                this.LineId =[-1];
+              }
+              else{
+                SigningLine.forEach(item => {
+                  this.LineId.push(Number(item));
+                }); 
+              }
+              this.SettlementType = this.addMsg.SettlementType.split(',')
 
               Vue.set(this.addMsg, 'ContractStartDateInfo', [])
               this.addMsg.ContractStartDateInfo.push(data.ContractStartDateStr)