no message

src/components/FinancialModule/HandDispensingFee/list.vue

@@ -33,7 +33,7 @@
               <td v-if="childIndex==0" :rowspan="subItem.DetailList.length">
                 {{subItem.ClientName}} 
                 <el-popover style="max-width: 900px;" trigger="click" popper-class="pro_tripDetails">
-                    <el-tag v-for="(ds, din) in Details" :key="ds" size="small">{{ds.ClientName}}</el-tag>
+                    <el-tag v-for="(ds, din) in Details" :key="ds" size="small" v-if="Details">{{ds.ClientName}}</el-tag>
                     <span slot="reference" @click="getDetails(subIndex,1)" style="color: #409EFF;cursor: pointer;">历史付款对象</span>
                 </el-popover>
               </td>
@@ -50,7 +50,7 @@
                 <p>{{subItem.UpdateByName}}</p>
                 <p>{{subItem.UpdateDate}}</p>
               </td>
-              <td v-if="S_CheckAllOrder">
+              <td v-if="S_CheckAllOrder&&childIndex==0" :rowspan="subItem.DetailList.length">
                 <el-button-group size='mini'>
                     <el-tooltip class="item" effect="dark" content="编辑手配费" placement="top-start">
                       <el-button type="primary" icon="el-icon-edit"
@@ -72,7 +72,7 @@
   
         </table>
       </div>
-      <el-dialog title="手配费" :visible.sync="showVisible" width="1020px">
+      <el-dialog title="手配费" :visible.sync="showVisible" width="970px">
         <el-form ref="addMsg" :model="addMsg" :rules="rules" label-width="90px">
           <el-row>
             <el-col :span="6">
@@ -81,7 +81,7 @@
                   </el-form-item>
             </el-col>
             <el-col :span="6">
-                <el-form-item label="付款对象" prop="">
+                <el-form-item label="付款对象" prop="ClientID">
                     <el-select filterable v-model="addMsg.ClientID" placeholder="选择付款对象" style="width: 100%;">
                       <el-option v-for="item in ClientAccountList" 
                       :label="item.AccountAlias" :value="item.ID" :key='item.ID'>
@@ -111,10 +111,9 @@
             <div style="width: 100%;border-bottom: 1px solid #e2e2e2;padding-bottom: 10px;margin-top: 10px;"
               v-for="(x,y) in addMsg.DetailList" :key='y'>
               <div style="display: flex;align-items: center;margin-bottom: 10px;">
-                    <el-form-item :prop="'DetailList.'+ y +'.Type'" 
-                    :rules="productGroup.Type" label="类型">
-                      <el-select style="width: 100px;" v-model="x.Type" @change="gettdName(x.Id,y,1)"
-                        clearable>
+                    <el-form-item label="类型">
+                      <el-select style="width: 80px;" v-model="x.Type" @change="gettdName(x.Id,y,1)"
+                        clearable disabled>
                         <el-option v-for="item in TypeListArr" :key="item.Id" :label="item.Name" :disabled="item.disabled"
                           :value="item.Id"></el-option>
                       </el-select>
@@ -127,7 +126,7 @@
                     </el-form-item>
                     <el-form-item :prop="'DetailList.'+ y +'.CostTypeId'" 
                     :rules="productGroup.CostTypeId" label="费用类型">
-                      <el-select v-model="x.CostTypeId" style="width: 100px;" @change="gettdName(x.Id,y,2)"
+                      <el-select filterable v-model="x.CostTypeId" style="width: 100px;" @change="gettdName(x.Id,y,2)"
                         clearable>
                         <el-option v-for="item in costType" :key="item.ID" :label="item.Name"
                           :value="item.ID"></el-option>
@@ -135,7 +134,7 @@
                     </el-form-item>
                     <el-form-item :prop="'DetailList.'+ y +'.FlowZId'" 
                     :rules="productGroup.FlowZId" label="总部流程">
-                      <el-select v-model="x.FlowZId" style="width: 100px;" @change="gettdName(x.Id,y,3)"
+                      <el-select filterable v-model="x.FlowZId" style="width: 100px;" @change="gettdName(x.Id,y,3)"
                         clearable>
                         <el-option v-for="item in TemplateGetList" :key="item.Id" :label="item.Name"
                           :value="item.Id"></el-option>
@@ -143,23 +142,23 @@
                     </el-form-item>
                     <el-form-item :prop="'DetailList.'+ y +'.FlowFId'" 
                     :rules="productGroup.FlowFId" label="分部流程">
-                      <el-select v-model="x.FlowFId" style="width: 100px;" @change="gettdName(x.Id,y,4)"
+                      <el-select filterable v-model="x.FlowFId" style="width: 100px;" @change="gettdName(x.Id,y,4)"
                         clearable>
                         <el-option v-for="item in TemplateGetList" :key="item.Id" :label="item.Name"
                           :value="item.Id"></el-option>
                       </el-select>
                     </el-form-item>
                 <div>
-                  <el-button style="margin-left: 15px;padding: 6px;" type="danger" size="mini"  class="el-icon-delete" circle
+                  <!-- <el-button style="margin-left: 15px;padding: 6px;" type="danger" size="mini"  class="el-icon-delete" circle
                   v-if="addMsg.DetailList.length>1" @click="addMsg.DetailList.splice(y,1)">
-                </el-button>
+                </el-button> -->
                 </div>
   
               </div>
   
             </div>
-            <el-button  size="mini" type="primary"
-              class="el-icon-circle-plus-outline" circle @click="addDetailList"></el-button>
+            <!-- <el-button  size="mini" type="primary"
+              class="el-icon-circle-plus-outline" circle @click="addDetailList"></el-button> -->
           </el-form-item>
   
         </el-form>
@@ -181,7 +180,7 @@
       ClientID: null,
       ClientIds:'',
       DetailList: [{
-        Type: '',
+        Type: 1,
         Unit_Price: null,
         CostTypeId: null,
         FlowZId: null,
@@ -427,7 +426,7 @@
             ClientID: null,
             ClientIds:'',
             DetailList: [{
-                Type: '',
+                Type: 1,
                 Unit_Price: null,
                 CostTypeId: null,
                 FlowZId: null,
@@ -435,26 +434,26 @@
             }],
           }
           this.showVisible = true;
+          this.addDetailList()
         },
         addDetailList() { //新增类型
-          let isdisabled = false
-          let isdisabledXHS = false
-          for(let i = 0;i<this.addMsg.DetailList.length;i++){
-            let x = this.addMsg.DetailList[i]
-          }
-          let obj = {
-            Type: '',
-            Unit_Price: null,
-            CostTypeId: null,
-            FlowZId: null,
-            FlowFId: null
+          // let isdisabled = false
+          // let isdisabledXHS = false
+          for(let i = 2;i<5;i++){
+            let obj = {
+              Type: i,
+              Unit_Price: null,
+              CostTypeId: null,
+              FlowZId: null,
+              FlowFId: null
+            }
+            console.log(obj,'=-----')
+            this.addMsg.DetailList.push(obj)
           }
-          this.addMsg.DetailList.push(obj)
         },
         submit(formName) {
           this.$refs[formName].validate((valid) => {
             if (valid) {
-                console.log(this.addMsg.HistoryClientList,'---')
                 let ClientIds
                 if(this.addMsg.HistoryClientList){
                     ClientIds = this.addMsg.HistoryClientList.map(item=>{ return item.ClientId})