优化

src/components/CreatePlan/ProductionVersion.vue

@@ -25,7 +25,7 @@
       >
       </el-table-column>
       <el-table-column
-        label="未成型数量"
+        label="未生产数量"
         align="center"
         prop="incompleteFormingNum"
       >

src/views/materialPlan copy/components/plan-view.vue

@@ -38,7 +38,7 @@
         {{ sumData.equipment }}台
       </div>
       <!-- <div class="items">
-        <span class="label">成型剂需求</span>
+        <span class="label">生产剂需求</span>
         14条
       </div>
       <div class="items">
@@ -176,7 +176,7 @@
         tableData: [],
         rule: {
           productNum: [
-            { required: true, message: '请输入成型数量', trigger: 'blur' }
+            { required: true, message: '请输入生产数量', trigger: 'blur' }
           ],
           planStartTime: [
             { required: true, message: '请选择开始日期', trigger: 'blur' }

src/views/materialPlan/components/plan-view.vue

@@ -38,7 +38,7 @@
         {{ sumData.equipment }}台
       </div>
       <!-- <div class="items">
-        <span class="label">成型剂需求</span>
+        <span class="label">生产剂需求</span>
         14条
       </div>
       <div class="items">
@@ -176,7 +176,7 @@
         tableData: [],
         rule: {
           productNum: [
-            { required: true, message: '请输入成型数量', trigger: 'blur' }
+            { required: true, message: '请输入生产数量', trigger: 'blur' }
           ],
           planStartTime: [
             { required: true, message: '请选择开始日期', trigger: 'blur' }

src/views/productionPlan/components/detail/plan.vue

@@ -31,8 +31,8 @@
       <el-descriptions-item label="要求生产数量">{{
         productionPlan.requiredFormingNum
       }}</el-descriptions-item>
-      <!-- <el-descriptions-item label="已成型数量">已成型数量</el-descriptions-item>
-      <el-descriptions-item label="未成型数量">未成型数量</el-descriptions-item> -->
+      <!-- <el-descriptions-item label="已生产数量">已生产数量</el-descriptions-item>
+      <el-descriptions-item label="未生产数量">未生产数量</el-descriptions-item> -->
       <el-descriptions-item label="实际交货数量">
          {{ productionPlan.deliveryNum}}
       </el-descriptions-item>
@@ -42,10 +42,10 @@
       <el-descriptions-item label="要求生产重量">{{
         productionPlan.requiredFormingWeight
       }}</el-descriptions-item>
-      <!-- <el-descriptions-item label="已成型重量">{{
+      <!-- <el-descriptions-item label="已生产重量">{{
         productionPlan.code
       }}</el-descriptions-item>
-      <el-descriptions-item label="未成型重量">{{
+      <el-descriptions-item label="未生产重量">{{
         productionPlan.code
       }}</el-descriptions-item> -->
       <el-descriptions-item label="使用改型">{{
@@ -89,10 +89,10 @@
         productRequirementInfo.printingRequirements
       }}</el-descriptions-item>
       <!-- <el-descriptions-item label="质量要求" :span="2"
-        >已成型数量</el-descriptions-item
+        >已生产数量</el-descriptions-item
       >
       <el-descriptions-item label="质量证书要求" :span="2"
-        >未成型数量</el-descriptions-item
+        >未生产数量</el-descriptions-item
       > -->
     </el-descriptions>
     <HeaderTitle title="销售订单信息" class="mt-20"> </HeaderTitle>

src/views/productionPlan/components/detail/prod.vue

@@ -13,8 +13,8 @@
       <el-descriptions-item label="改型生产数量"
         >改型生产数量</el-descriptions-item
       >
-      <el-descriptions-item label="已成型工单数量"
-        >已成型工单数量</el-descriptions-item
+      <el-descriptions-item label="已生产工单数量"
+        >已生产工单数量</el-descriptions-item
       >
       <el-descriptions-item label="产线">产线</el-descriptions-item>
       <el-descriptions-item label="未开工数">未开工数</el-descriptions-item>
@@ -42,8 +42,8 @@
       <el-descriptions-item label="预计交付时间"
         >预计交付时间</el-descriptions-item
       >
-      <el-descriptions-item label="成型完成时间"
-        >成型完成时间</el-descriptions-item
+      <el-descriptions-item label="生产完成时间"
+        >生产完成时间</el-descriptions-item
       >
       <el-descriptions-item label="生产完成时间"
         >生产完成时间</el-descriptions-item
@@ -60,7 +60,7 @@
         ></el-progress>
       </div>
       <div class="progress-item">
-        <div class="label"> 已成型数量 </div>
+        <div class="label"> 已生产数量 </div>
         <el-progress
           :percentage="20"
           color="rgba(0, 191, 191, 1)"
@@ -121,15 +121,15 @@
           },
           {
             prop: 'name',
-            label: '已成型数量'
+            label: '已生产数量'
           },
           {
             prop: 'name',
-            label: '已成型重量'
+            label: '已生产重量'
           },
           {
             prop: 'name',
-            label: '成型完成时间'
+            label: '生产完成时间'
           },
           {
             prop: 'name',

src/views/productionPlan/components/plan-view.vue

@@ -30,11 +30,11 @@
         {{ tableData.length }}条
       </div>
       <div class="items">
-        <span class="label">累计成型数量</span>
+        <span class="label">累计生产数量</span>
         {{ sumData.formingNum }}pcs
       </div>
       <div class="items">
-        <span class="label">累计成型重量</span>
+        <span class="label">累计生产重量</span>
         {{ sumData.formingWeight && (+sumData.formingWeight).toFixed(4) }}kg
       </div>
       <div class="items">
@@ -42,7 +42,7 @@
         {{ sumData.equipment }}台
       </div>
       <!-- <div class="items">
-        <span class="label">成型剂需求</span>
+        <span class="label">生产剂需求</span>
         14条
       </div>
       <div class="items">
@@ -54,7 +54,7 @@
       <el-table :data="tableData">
         <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column label="工单号" prop="code"></el-table-column>
-        <el-table-column label="成型数量" prop="" width="120">
+        <el-table-column label="生产数量" prop="" width="120">
           <template v-slot="{ row, $index }">
             <el-form-item
               :prop="`tableData.${$index}.formingNum`"
@@ -68,7 +68,7 @@
             </el-form-item>
           </template>
         </el-table-column>
-        <el-table-column label="成型重量" prop="" width="120">
+        <el-table-column label="生产重量" prop="" width="120">
           <template v-slot="{ row, $index }">
             <!-- :prop="`tableData.${$index}.formingWeight`" -->
             <el-form-item :rules="rule.formingWeight">
@@ -193,10 +193,10 @@
         tableData: [],
         rule: {
           formingNum: [
-            { required: true, message: '请输入成型数量', trigger: 'blur' }
+            { required: true, message: '请输入生产数量', trigger: 'blur' }
           ],
           formingWeight: [
-            { required: true, message: '请输入成型重量', trigger: 'blur' }
+            { required: true, message: '请输入生产重量', trigger: 'blur' }
           ],
           planStartTime: [
             { required: true, message: '请选择开始日期', trigger: 'blur' }
@@ -379,7 +379,7 @@
           // deviceName	设备名称		false
           // executorId	执行人id		false
           // executorName	执行人名称		false
-          // formingNum	成型数量		false
+          // formingNum	生产数量		false
           // generativeRules	生成规则		false
           // planCompleteTime	计划完成时间		false
           // planStartTime	计划开始时间		false

src/views/productionPlan/components/productionPlan-search.vue

@@ -107,10 +107,10 @@
             >
               <el-option label="要求生产日期" value="reqMoldTime"></el-option>
               <el-option
-                label="预测成型日期"
+                label="预测生产日期"
                 value="planFormingTime"
               ></el-option>
-              <!-- <el-option label="实际成型日期" value="formingTime"></el-option> -->
+              <!-- <el-option label="实际生产日期" value="formingTime"></el-option> -->
             </el-select>
           </template>
           <el-date-picker

src/views/productionPlan/index.vue

@@ -147,7 +147,7 @@
           second: [
             // {
             //   prop: 'formingTime',
-            //   label: '实际成型日期',
+            //   label: '实际生产日期',
             //   align: 'center',
             //   showOverflowTooltip: true,
             //   minWidth: 110
@@ -161,7 +161,7 @@
             },
             {
               prop: 'planFormingTime',
-              label: '预测成型日期',
+              label: '预测生产日期',
               align: 'center',
               showOverflowTooltip: true,
               minWidth: 110
@@ -251,7 +251,7 @@
 
           // {
           //   prop: '',
-          //   label: '已成型数量',
+          //   label: '已生产数量',
           //   align: 'center',
           //   showOverflowTooltip: true,
           //   minWidth: 110

src/views/saleOrder/components/order-detail.vue

@@ -246,9 +246,9 @@
           prop="requiredFormingNum"
         >
         </el-table-column>
-        <!-- <el-table-column label="未成型数量" align="center" width="120" prop="unfinishedQuantity">
+        <!-- <el-table-column label="未生产数量" align="center" width="120" prop="unfinishedQuantity">
 			  </el-table-column>
-			  <el-table-column label="已成型数量" align="center" width="120" prop="finishedQuantity">
+			  <el-table-column label="已生产数量" align="center" width="120" prop="finishedQuantity">
 			  </el-table-column>
 			  <el-table-column label="已交付量" align="center" prop="deliveredQuantity">
 			  </el-table-column>

src/views/saleOrder/components/plan-submit.vue

@@ -58,7 +58,7 @@
           {{ info.newSumOrderWeight }} {{  info.newWeightUnit }}
         </el-descriptions-item>
         <el-descriptions-item>
-          <template slot="label"> 成型完成日期 </template>
+          <template slot="label"> 生产完成日期 </template>
           {{ info.reqMoldTime }}
         </el-descriptions-item>
         <el-descriptions-item :span="3">