Explorar o código

feat(销售订单): 销售订单,生产计划,生产订单增加生产要求字段

liujt hai 8 meses
pai
achega
504df52335

+ 7 - 1
src/views/productionPlan/components/detail/plan.vue

@@ -67,7 +67,10 @@
       <el-descriptions-item label="使用改型">{{
       <el-descriptions-item label="使用改型">{{
         productionPlan.modification ? '是' : '否'
         productionPlan.modification ? '是' : '否'
       }}</el-descriptions-item>
       }}</el-descriptions-item>
-      <el-descriptions-item label="备注" :span="5">{{
+      <el-descriptions-item label="生产要求">{{
+        salesOrderList.productionRequirements
+      }}</el-descriptions-item>
+      <el-descriptions-item label="备注" :span="4">{{
         productionPlan.notes
         productionPlan.notes
       }}</el-descriptions-item>
       }}</el-descriptions-item>
     </el-descriptions>
     </el-descriptions>
@@ -171,6 +174,9 @@
       },
       },
       productRequirementInfo() {
       productRequirementInfo() {
         return this.infoData.productRequirementInfo || {};
         return this.infoData.productRequirementInfo || {};
+      },
+      salesOrderList() {
+        return this.infoData.salesOrderList[0] || {};
       }
       }
     },
     },
     data() {
     data() {

+ 11 - 0
src/views/saleOrder/components/create-order.vue

@@ -148,6 +148,17 @@
               </DictSelection>
               </DictSelection>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
+          <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
+            <el-form-item label="生产要求:" required>
+              <el-input
+                v-model="form.productionRequirements"
+                style="width: 100%"
+                placeholder=""
+                type="textarea"
+                disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         </el-row>
 
 
         <el-table :data="form.productInfoList" border height="40vh" key="id">
         <el-table :data="form.productInfoList" border height="40vh" key="id">

+ 4 - 0
src/views/saleOrder/components/order-detail.vue

@@ -98,6 +98,10 @@
           <template slot="label"> 生产状态 </template>
           <template slot="label"> 生产状态 </template>
           {{ getDictValue('生产状态', form.salesOrderBasicInfo.status) }}
           {{ getDictValue('生产状态', form.salesOrderBasicInfo.status) }}
         </el-descriptions-item>
         </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 生产要求 </template>
+          {{ form.salesOrderBasicInfo.productionRequirements }}
+        </el-descriptions-item>
       </el-descriptions>
       </el-descriptions>
       <div class="basic-details-title border-none">
       <div class="basic-details-title border-none">
         <span class="border-span">产品规格需求</span>
         <span class="border-span">产品规格需求</span>

+ 4 - 0
src/views/saleOrder/components/plan-submit.vue

@@ -81,6 +81,10 @@
           <template slot="label"> 所属工厂 </template>
           <template slot="label"> 所属工厂 </template>
           {{ info.factoriesIdName }}
           {{ info.factoriesIdName }}
         </el-descriptions-item>
         </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"> 生产要求 </template>
+          {{ info.productionRequirements }}
+        </el-descriptions-item>
         <el-descriptions-item :span="3">
         <el-descriptions-item :span="3">
           <template slot="label"> </template>
           <template slot="label"> </template>
         </el-descriptions-item>
         </el-descriptions-item>

+ 5 - 0
src/views/saleOrder/index.vue

@@ -521,6 +521,11 @@
             prop: 'hostDescription',
             prop: 'hostDescription',
             label: '主机描述',
             label: '主机描述',
             showOverflowTooltip: true
             showOverflowTooltip: true
+          },
+          {
+            prop: 'productionRequirements',
+            label: '生产要求',
+            showOverflowTooltip: true
           }
           }
         ];
         ];
       },
       },

+ 17 - 1
src/views/saleOrder/salesToProductionNewTwo.vue

@@ -230,6 +230,18 @@
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
 
 
+          <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
+            <el-form-item label="生产要求:" required>
+              <el-input
+                v-model="form.productionRequirements"
+                style="width: 100%"
+                placeholder=""
+                type="textarea"
+                disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
           <!-- <el-form-item label="生产类型:" prop="produceType">
           <!-- <el-form-item label="生产类型:" prop="produceType">
                 <el-select v-model="form.produceType" style="width: 100%"   @change="changeProduceType" >
                 <el-select v-model="form.produceType" style="width: 100%"   @change="changeProduceType" >
                     <el-option
                     <el-option
@@ -1120,6 +1132,8 @@
         // if (data.endTime) {
         // if (data.endTime) {
         //   this.form.endTime = new Date(data.endTime);
         //   this.form.endTime = new Date(data.endTime);
         // }
         // }
+        this.form.productionRequirements =
+            data?.salesOrders[0]?.productionRequirements || '';
         if (!data.bomCategoryId || data.bomCategoryId == null) {
         if (!data.bomCategoryId || data.bomCategoryId == null) {
           this.form.produceType = '';
           this.form.produceType = '';
           this.selectionRowShow = true;
           this.selectionRowShow = true;
@@ -1273,8 +1287,10 @@
         let params = JSON.parse(this.$route.query.selection);
         let params = JSON.parse(this.$route.query.selection);
         productionToPlan(params).then((res) => {
         productionToPlan(params).then((res) => {
           this.form = deepClone(res);
           this.form = deepClone(res);
-          console.log(222222222222222222222222, '===');
+          console.log(222222222222222222222222, '===', res);
           this.initTime();
           this.initTime();
+          this.form.productionRequirements =
+            res?.salesOrders[0]?.productionRequirements || '';
           // this.bomListVersion('init');
           // this.bomListVersion('init');
           this.form.produceRoutingName =
           this.form.produceRoutingName =
             res.produceRoutingName || this.$route.query.produceRoutingName;
             res.produceRoutingName || this.$route.query.produceRoutingName;

+ 3 - 0
src/views/workOrder/components/details.vue

@@ -417,6 +417,9 @@
             { label: '颜色:', prop: 'colorKey' },
             { label: '颜色:', prop: 'colorKey' },
             { label: '派单人:', prop: 'dispatcher' },
             { label: '派单人:', prop: 'dispatcher' },
             { label: '派单时间:', prop: 'dispatchTime' }
             { label: '派单时间:', prop: 'dispatchTime' }
+          ],
+          [
+            { label: '生产要求:', prop: 'productionRequirements' },
           ]
           ]
         ],
         ],
         shiftList: [],
         shiftList: [],