部分bug解决，流程加签bug

src/components/PDF/ReviewFormPDF.vue

@@ -57,8 +57,10 @@
             {{pdfData.productLength}}*{{pdfData.productWidth}}*{{pdfData.productHeight}}
           </td>
           <td>
+            客供材料交期
           </td>
           <td>
+            {{pdfData.custProvidDate}}
           </td>
         </tr>
         <tr>

src/components/process/SF/ReviewForm.vue

@@ -60,9 +60,14 @@
               <td>订单数量</td>
               <td>{{formData.data.quantity}}</td>
               <td>产品尺寸(cm)</td>
-              <td colspan="3">
+              <td>
                 {{formData.data.productLength}}*{{formData.data.productWidth}}*{{formData.data.productHeight}}
               </td>
+              <td>客供材料交期</td>
+              <td>
+                <el-date-picker v-model="formData.data.custProvidDate" type="date" placeholder=" " value-format="YYYY-MM-DD" style="width:100%"
+                                :disabled="!isInformationDept" />
+              </td>
             </tr>
             <tr>
               <td colspan="2">环保要求</td>
@@ -167,10 +172,10 @@
               <td rowspan="3">采购部</td>
               <td>主材交期</td>
               <td colspan="3">
-                <el-form-item prop="mainMaterialTime" label-width="0px" class="margin-b-0">
-                  <el-date-picker v-model="formData.data.mainMaterialTime" type="date" placeholder=" " value-format="YYYY-MM-DD" style="width:100%"
-                                  :disabled="!isProcurementDept" />
-                </el-form-item>
+                <!-- <el-form-item prop="mainMaterialTime" label-width="0px" class="margin-b-0"> -->
+                <el-date-picker v-model="formData.data.mainMaterialTime" type="date" placeholder=" " value-format="YYYY-MM-DD" style="width:100%"
+                                :disabled="!isProcurementDept" />
+                <!-- </el-form-item> -->
               </td>
               <td>包材交期</td>
               <td colspan="3">

src/views/EHSD/saleContract/contractEHSD/index.vue

@@ -1174,9 +1174,7 @@ const config = computed(() => {
                 },
               }
             : {},
-          row.status == 30 &&
-          row.produceStatus == 1 &&
-          row.orderDistributeStatus == 1
+          row.status == 30 && row.isScheduling == 1
             ? {
                 attrs: {
                   label: "终止生产",

src/views/MES/productionTask/index.vue

@@ -198,10 +198,13 @@
         <template v-for="(slotItem, index) in processesData" v-slot:[slotItem.id]="{ item }" :key="slotItem.id">
           <div style="width:100%">
             <div v-if="pageActiveName !='4'">
-              <span v-if="isShowCotent(slotItem,item)" style="font-weight:700;min-width:50px;line-height:18px;display:inline-block;cursor:pointer"
-                    :class="showCotentQuantity(slotItem,item)" @contextmenu="(e)=>handleContextmenu(slotItem,item,e)">
-                {{showCotent(slotItem,item,'finishQuantity')}}
-              </span>
+              <el-tooltip v-if="isShowCotent(slotItem,item)" class="box-item" effect="dark" :content="showCotentTwo(slotItem,item,'finishQuantity')"
+                          placement="top-start">
+                <span style="font-weight:700;min-width:50px;line-height:18px;display:inline-block;cursor:pointer"
+                      :class="showCotentQuantity(slotItem,item)" @contextmenu="(e)=>handleContextmenu(slotItem,item,e)">
+                  {{showCotent(slotItem,item,'finishQuantity')}}
+                </span>
+              </el-tooltip>
               <div v-else class="no-bk">
                 -
               </div>
@@ -333,10 +336,13 @@
         <template v-for="(slotItem, index) in processesData" v-slot:[slotItem.id]="{ item }" :key="slotItem.id">
           <div style="width:100%">
             <div v-if="pageActiveName !='4'">
-              <span v-if="isShowCotent(slotItem,item)" style="font-weight:700;min-width:50px;line-height:18px;display:inline-block;cursor:pointer"
-                    :class="showCotentQuantity(slotItem,item)" @contextmenu="(e)=>handleContextmenu(slotItem,item,e)">
-                {{showCotent(slotItem,item,'finishQuantity')}}
-              </span>
+              <el-tooltip v-if="isShowCotent(slotItem,item)" class="box-item" effect="dark" :content="showCotentTwo(slotItem,item,'finishQuantity')"
+                          placement="top-start">
+                <span style="font-weight:700;min-width:50px;line-height:18px;display:inline-block;cursor:pointer"
+                      :class="showCotentQuantity(slotItem,item)" @contextmenu="(e)=>handleContextmenu(slotItem,item,e)">
+                  {{showCotent(slotItem,item,'finishQuantity')}}
+                </span>
+              </el-tooltip>
               <div v-else class="no-bk">
                 -
               </div>
@@ -2311,6 +2317,24 @@ const showCotent = (slot, item, att) => {
   }
 };
 
+const showCotentTwo = (slot, item, att) => {
+  if (item && item.productionTaskProgressList) {
+    const current = item.productionTaskProgressList.find(
+      (x) => x.processesId == slot.id
+    );
+    if (current) {
+      return (
+        "已完成" +
+        current["schedulingCount"] +
+        " / 结存" +
+        current["finishQuantity"]
+      );
+    }
+  } else {
+    return false;
+  }
+};
+
 const showCotentOne = (slot, item, att) => {
   if (item && item.productionTaskProgressList) {
     const current = item.productionTaskProgressList.find(

src/views/process/processApproval/index.vue

@@ -397,6 +397,7 @@ const handleNextClose = () => {
     const node = nextHandleUser.value[i];
     node.handleUserId = "";
   }
+  nextHandleUser.value = [];
   btnLoading.value = false;
   dialogVisible.value = false;
 };