修改 发布信息

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

@@ -5,10 +5,8 @@
       <el-descriptions-item label="计划单号">{{
         productionPlan.code
       }}</el-descriptions-item>
-      <el-descriptions-item
-        :label="'计划数量'"
-        >{{ productionPlan.productNum }}  {{ clientEnvironmentId == '4' ? '(方)' : productionPlan.measuringUnit  }}</el-descriptions-item
-      >
+      <el-descriptions-item :label="'计划数量'">{{ productionPlan.productNum }} {{ clientEnvironmentId == '4' ? '(方)' :
+        productionPlan.measuringUnit }}</el-descriptions-item>
 
       <el-descriptions-item label="计划创建人">{{
         productionPlan.createUserName
@@ -20,9 +18,9 @@
         productionPlan.productNum &&
         productionPlan.productNum * productionPlan.productUnitWeight
       }}
-      {{ productionPlan.weightUnit}}
-      
-    </el-descriptions-item>
+        {{ productionPlan.weightUnit }}
+
+      </el-descriptions-item>
 
       <el-descriptions-item label="计划创建时间">{{
         productionPlan.createTime
@@ -30,14 +28,11 @@
       <el-descriptions-item label="计划完成日期">{{
         productionPlan.planDeliveryTime
       }}</el-descriptions-item>
-      <el-descriptions-item
-        :label="'要求生产数量' + (clientEnvironmentId == '4' ? '(方)' : '')"
-        >{{ productionPlan.requiredFormingNum }}  {{ clientEnvironmentId == '4' ? '(方)' : productionPlan.measuringUnit  }}</el-descriptions-item
-      >
-
-      <el-descriptions-item
-        :label="'实际交货数量' + (clientEnvironmentId == '4' ? '(方)' : '')"
-      >
+      <el-descriptions-item :label="'要求生产数量' + (clientEnvironmentId == '4' ? '(方)' : '')">{{
+        productionPlan.requiredFormingNum }} {{ clientEnvironmentId == '4' ? '(方)' : productionPlan.measuringUnit
+        }}</el-descriptions-item>
+
+      <el-descriptions-item :label="'实际交货数量' + (clientEnvironmentId == '4' ? '(方)' : '')">
         {{ productionPlan.deliveryNum }}
       </el-descriptions-item>
       <el-descriptions-item label="实际完成时间">
@@ -45,7 +40,7 @@
       </el-descriptions-item>
       <el-descriptions-item label="要求生产重量">{{
         productionPlan.requiredFormingWeight
-      }}   {{ productionPlan.weightUnit}}</el-descriptions-item>
+      }} {{ productionPlan.weightUnit }}</el-descriptions-item>
 
       <el-descriptions-item label="使用改型">{{
         productionPlan.modification ? '是' : '否'
@@ -54,76 +49,71 @@
         productionPlan.notes
       }}</el-descriptions-item>
     </el-descriptions>
-    <HeaderTitle title="产品需求信息" class="mt-20"> </HeaderTitle>
-    <el-descriptions :column="5" border>
-      <el-descriptions-item label="物料编码">{{
-        productRequirementInfo.productCode
-      }}</el-descriptions-item>
-      <el-descriptions-item label="牌号">{{
-        productRequirementInfo.bandNo
-      }}</el-descriptions-item>
 
-      <el-descriptions-item label="重量单位">{{
-        productRequirementInfo.unitWeight
-      }}</el-descriptions-item>
-      <el-descriptions-item label="计量单位">{{
-        productRequirementInfo.unitMeasurement
-      }}</el-descriptions-item>
-      <el-descriptions-item label="产品层次4">{{
-        productRequirementInfo.productLevel4
-      }}</el-descriptions-item>
-      <el-descriptions-item label="产品层次5">{{
-        productRequirementInfo.productLevel5
-      }}</el-descriptions-item>
+    <div>
+      <HeaderTitle title="产品需求信息" class="mt-20"> </HeaderTitle>
+      <el-descriptions :column="5" border>
+        <el-descriptions-item label="物料编码">{{
+          productRequirementInfo.productCode
+        }}</el-descriptions-item>
+        <el-descriptions-item label="牌号">{{
+          productRequirementInfo.bandNo
+        }}</el-descriptions-item>
 
-      <el-descriptions-item label="物料描述" :span="3">{{
-        productRequirementInfo.materialDesc
-      }}</el-descriptions-item>
-      <el-descriptions-item label="技术要求" :span="2">{{
-        productRequirementInfo.technicalRequirement
-      }}</el-descriptions-item>
-      <el-descriptions-item label="印字要求" :span="2">{{
-        productRequirementInfo.printingRequirements
-      }}</el-descriptions-item>
+        <el-descriptions-item label="重量单位">{{
+          productRequirementInfo.unitWeight
+        }}</el-descriptions-item>
+        <el-descriptions-item label="计量单位">{{
+          productRequirementInfo.unitMeasurement
+        }}</el-descriptions-item>
+        <el-descriptions-item label="产品层次4">{{
+          productRequirementInfo.productLevel4
+        }}</el-descriptions-item>
+        <el-descriptions-item label="产品层次5">{{
+          productRequirementInfo.productLevel5
+        }}</el-descriptions-item>
 
-    </el-descriptions>
-    <HeaderTitle title="销售订单信息" class="mt-20"> </HeaderTitle>
-    <ele-pro-table
-      ref="table"
-      :columns="columns"
-      :datasource="infoData.salesOrderList"
-    >
-       
-    <template v-slot:contractNum="{ row }">
-      {{ row.contractNum }} {{row.measuringUnit}}
-      </template>
-
-
-             
-    <template v-slot:productSumWeight="{ row }">
-      {{ row.productSumWeight }} {{row.weightUnit}}
-      </template>
-
-
-      <template v-slot:number="{ row }">
-        <div class="progress-box">
-          <div class="gress">
-            <el-progress
-              :percentage="
-                +(((row.deliveryNum || 0) / row.contractNum) * 100).toFixed(2)
-              "
-              color="red"
-              :show-text="false"
-              text-color="#000"
-              :stroke-width="16"
-            ></el-progress
-          ></div>
-          <div :span="6">{{
-            `${row.deliveryNum || 0}/ ${row.contractNum}`
-          }}</div>
-        </div>
-      </template>
-    </ele-pro-table>
+        <el-descriptions-item label="物料描述" :span="3">{{
+          productRequirementInfo.materialDesc
+        }}</el-descriptions-item>
+        <el-descriptions-item label="技术要求" :span="2">{{
+          productRequirementInfo.technicalRequirement
+        }}</el-descriptions-item>
+        <el-descriptions-item label="印字要求" :span="2">{{
+          productRequirementInfo.printingRequirements
+        }}</el-descriptions-item>
+
+      </el-descriptions>
+    </div>
+
+    <div v-if="infoData.salesOrderList.length">
+      <HeaderTitle title="销售订单信息" class="mt-20"> </HeaderTitle>
+      <ele-pro-table ref="table" :columns="columns" :datasource="infoData.salesOrderList">
+
+        <template v-slot:contractNum="{ row }">
+          {{ row.contractNum }} {{ row.measuringUnit }}
+        </template>
+
+
+
+        <template v-slot:productSumWeight="{ row }">
+          {{ row.productSumWeight }} {{ row.weightUnit }}
+        </template>
+
+
+        <template v-slot:number="{ row }">
+          <div class="progress-box">
+            <div class="gress">
+              <el-progress :percentage="+(((row.deliveryNum || 0) / row.contractNum) * 100).toFixed(2)
+                " color="red" :show-text="false" text-color="#000" :stroke-width="16"></el-progress>
+            </div>
+            <div :span="6">{{
+              `${row.deliveryNum || 0}/ ${row.contractNum}`
+              }}</div>
+          </div>
+        </template>
+      </ele-pro-table>
+    </div>
   </div>
 </template>
 
@@ -193,7 +183,7 @@ export default {
           prop: 'deliveryTime',
           label: '交付日期'
         },
-    
+
         {
           prop: 'customerName',
           label: '客户名称'
@@ -207,6 +197,7 @@ export default {
 .mt-20 {
   margin-top: 20px;
 }
+
 .progress-box {
   display: flex;
   justify-content: space-between;

src/views/productionPlan/detail.vue

@@ -57,7 +57,7 @@ export default {
   methods: {
     async getDetail() {
       const data = await getProductPlanDetail(this.$route.query.id);
-
+   
       this.infoData = data;
     }
   }

src/views/saleOrder/salesToProductionNew.vue

@@ -138,6 +138,23 @@
               <el-input placeholder="请输入计划编号" v-model="form.code" disabled></el-input>
             </el-form-item>
           </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="牌号:">
+              <el-input placeholder="请输入计划牌号" v-model="form.brandNo" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="规格:">
+              <el-input placeholder="请输入计划规格" v-model="form.specification" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:">
+              <el-input placeholder="请输入计划型号" v-model="form.model" disabled></el-input>
+            </el-form-item>
+          </el-col>
+
         </el-row>
 
 
@@ -511,7 +528,6 @@ export default {
 
     },
     toSubmit() {
-      if (!this.form.factoriesId) return this.$message.warning('请选择所属工厂');
 
       this.$refs.form.validate((valid) => {