优化

src/views/bpm/handleTask/components/materialPlan/detailDialog.vue

@@ -2,13 +2,7 @@
   <div>
 
     <headerTitle title="采购信息"></headerTitle>
-    <el-form
-      :model="formData"
-      ref="formRef"
-      label-width="120px"
-      class="ele-body"
-      :rules="rules"
-    >
+    <el-form :model="formData" ref="formRef" label-width="120px" class="ele-body" :rules="rules">
       <el-row :gutter="32">
         <el-col :span="12">
           <el-form-item label="配料计划名称" prop="name">
@@ -25,31 +19,16 @@
     </el-form>
 
     <el-form :model="formData" ref="tableForm">
-      <ele-pro-table
-        ref="table"
-        :needPage="false"
-        :columns="columns"
-        row-key="id"
-      >
+      <ele-pro-table ref="table" :needPage="false" :columns="columns" row-key="id">
         <!-- 展开内容 -->
         <template v-slot:expand="{ row }">
-          <div
-            style="
+          <div style="
               width: calc(100% - 95px);
               min-height: 60px;
               margin-left: 95px;
-            "
-            v-if="row.materialList.length > 0"
-          >
-            <ele-pro-table
-              :toolbar="false"
-              toolsTheme="none"
-              ref="table2"
-              :need-page="false"
-              :datasource="row.materialList"
-              :columns="columns2"
-              row-key="id"
-            >
+            " v-if="row.materialList.length > 0">
+            <ele-pro-table :toolbar="false" toolsTheme="none" ref="table2" :need-page="false"
+              :datasource="row.materialList" :columns="columns2" row-key="id">
               <template v-slot:sort="{ $index }">
                 {{ $index }}
               </template>
@@ -59,8 +38,8 @@
               </template>
 
               <template v-slot:requireDeliveryTime="{ row }">
-                <span v-if="row.deliveryMethod == 1">{{  row.requireDeliveryTime  }}</span>
-           
+                <span v-if="row.deliveryMethod == 1">{{ row.requireDeliveryTime }}</span>
+
 
                 <el-link type="primary" :underline="false" v-if="row.deliveryMethod == 2"
                   @click.native="handleMethod(row)">
@@ -68,23 +47,35 @@
                 </el-link>
               </template>
 
-            <!-- <template v-slot:imgUrl="{ row }">
-                {{ row }}
+
+              <template v-slot:imgUrl="{ row }">
+                <div v-if="row.imgUrl && row.imgUrl?.length">
+                  <el-link v-for="link in row.imgUrl" :key="link.id" type="primary" :underline="false"
+                    @click="downloadFile(link)">
+                    {{ link.name }}</el-link>
+                </div>
+              </template>
+
+              <template v-slot:files="{ row }">
+                <div v-if="row.files && row.files?.length">
+                  <el-link v-for="link in row.files" :key="link.id" type="primary" :underline="false"
+                    @click="downloadFile(link)">
+                    {{ link.name }}</el-link>
+                </div>
               </template>
-              -->
 
-           <!-- <template v-slot:files="{ row }" v-if='row.files != ""'>
-                {{ row.files }}
-              </template> -->
 
-        
+
+
+
+
             </ele-pro-table>
           </div>
         </template>
       </ele-pro-table>
     </el-form>
 
-    <timeDialog ref="timeDialogRef" ></timeDialog>
+    <timeDialog ref="timeDialogRef"></timeDialog>
   </div>
 </template>
   
@@ -128,7 +119,7 @@ export default {
         },
 
         {
-          prop: 'code',
+          prop: 'salesOrderCode',
           label: '销售订单号',
           showOverflowTooltip: true,
           align: 'center',
@@ -191,7 +182,7 @@ export default {
           align: 'center'
         },
 
-  
+
 
 
       ],
@@ -228,34 +219,35 @@ export default {
         },
 
         {
-          prop: 'packingCountBase',
-          label: '计量库存',
-          sortable: 'custom',
-          align: 'center'
+          prop: 'inventoryQuantity',
+          label: '库存',
+          showOverflowTooltip: true,
+
         },
 
         {
-          label: '计量单位',
           prop: 'unit',
-          align: 'center'
+          label: '计量单位',
+          showOverflowTooltip: true,
+          action: 'unit',
         },
 
         {
-          label: '需求数量', 
-          action: 'demandQuantity',
-          align: 'center'
+          label: '需求数量',
+          prop: 'demandQuantity',
+          align: 'center',
         },
 
         {
           label: '采购数量',
-          action: 'purchaseQuantity',
+          prop: 'purchaseQuantity',
           align: 'center'
         },
 
         {
           label: '到货方式',
           slot: 'deliveryMethod',
-          action: ' deliveryMethod',
+          action: 'deliveryMethod',
           align: 'center'
         },
 
@@ -266,7 +258,7 @@ export default {
           align: 'center'
         },
 
- 
+
 
         {
           label: '图纸',
@@ -279,12 +271,14 @@ export default {
         {
           label: '附件',
           slot: 'files',
-          action: 'files',
+          action: ' files',
           align: 'center',
+          minWidth: 140
         },
 
 
-   
+
+
       ],
 
       rules: {},
@@ -313,7 +307,10 @@ export default {
         this.$set(this.formData, 'remark', res.remark);
         this.formData['id'] = res.id;
         this.$refs.table.setData([...res.salesOrderList]);
-        this.$refs.table.toggleRowExpansionAll()
+        this.$nextTick(() => {
+          this.$refs.table.toggleRowExpansionAll()
+          this.$forceUpdate()
+        })
       }
     },
 

src/views/bpm/handleTask/components/materialPlan/timeDialog.vue

@@ -12,8 +12,8 @@
                 <el-table-column label="数量" prop="purchaseQuantity">
                     <template slot-scope="{ row, $index }">
                         <el-form-item :prop="'timeList.' + $index + '.purchaseQuantity'"
-                            :rules="tableFormRules.purchaseQuantity">
-                            <el-input placeholder="请输入" clearable v-model="row.purchaseQuantity"></el-input>
+                            >
+                            <el-input placeholder="请输入" disabled v-model="row.purchaseQuantity"></el-input>
                         </el-form-item>
 
                     </template>
@@ -25,8 +25,7 @@
                     <template slot-scope="{ row, $index }">
                         <el-form-item :prop="'timeList.' + $index + '.requireDeliveryTime'"
                             :rules="tableFormRules.requireDeliveryTime">
-                            <el-date-picker clearable v-model="row.requireDeliveryTime" type="date"
-                                value-format="yyyy-MM-dd" placeholder="请选择日期">
+                            <el-date-picker disabled v-model="row.requireDeliveryTime"  value-format="timestamp"   placeholder="请选择日期">
                             </el-date-picker>
                         </el-form-item>
                     </template></el-table-column>