生成要求

src/views/productionPlan/index.vue

@@ -622,6 +622,14 @@
             minWidth: 150,
             showOverflowTooltip: true
           },
+          {
+            prop: 'productionRequirements',
+            label: '生产要求',
+            align: 'center',
+            minWidth: 200,
+            showOverflowTooltip: true
+          },
+
           {
             prop: 'model',
             label: '型号',

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

@@ -148,7 +148,7 @@
               </DictSelection>
             </el-form-item>
           </el-col>
-          <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
+          <!-- <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
             <el-form-item label="生产要求:" required>
               <el-input
                 v-model="form.productionRequirements"
@@ -158,7 +158,7 @@
                 disabled
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
 
         <el-table :data="form.productInfoList" border height="40vh" key="id">
@@ -282,6 +282,32 @@
               </el-form-item>
             </template>
           </el-table-column>
+          <el-table-column
+            label="生产要求"
+            align="center"
+            prop="productionRequirements"
+            width="200"
+            v-if="title == '修改订单'"
+          >
+            <template slot-scope="scope">
+              <el-form-item
+                label-width="0px"
+                :prop="
+                  'productInfoList.' + scope.$index + '.productionRequirements'
+                "
+              >
+                <el-input
+                  style="width: 100%"
+                  size="small"
+                  v-model="scope.row.productionRequirements"
+                  placeholder="请输入"
+                  type="textarea"
+                  disabled
+                >
+                </el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
           <el-table-column
             label="批次号"
             align="center"

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

@@ -98,10 +98,10 @@
           <template slot="label"> 生产状态 </template>
           {{ 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-item> -->
       </el-descriptions>
       <div class="basic-details-title border-none">
         <span class="border-span">产品规格需求</span>
@@ -257,6 +257,13 @@
           prop="requiredFormingNum"
         >
         </el-table-column>
+        <el-table-column
+          label="生产要求"
+          align="center"
+          width="200"
+          prop="productionRequirements"
+        >
+        </el-table-column>
         <!-- <el-table-column label="未生产数量" align="center" width="120" prop="unfinishedQuantity">
 			  </el-table-column>
 			  <el-table-column label="已生产数量" align="center" width="120" prop="finishedQuantity">

src/views/saleOrder/index.vue

@@ -26,7 +26,6 @@
         :selection.sync="selection"
         height="calc(100vh - 390px)"
         full-height="calc(100vh - 116px)"
-
         autoAmendPage
         row-key="id"
         @sort-change="onSortChange"
@@ -350,6 +349,13 @@
             minWidth: 150,
             showOverflowTooltip: true
           },
+          {
+            prop: 'productionCodes',
+            label: '生产要求',
+            align: 'center',
+            minWidth: 180,
+            showOverflowTooltip: true
+          },
           {
             prop: 'brandNo',
             label: '牌号',
@@ -671,9 +677,7 @@
 
       /* 刷新表格 */
       reload(where) {
-        this.$nextTick(() =>
-          this.$refs.table.reload({ page: 1, where })
-        );
+        this.$nextTick(() => this.$refs.table.reload({ page: 1, where }));
       },
 
       changeTab(e) {

src/views/saleOrder/salesToProductionNew.vue

@@ -149,7 +149,15 @@
               ></el-input>
             </el-form-item>
           </el-col>
-
+          <el-col :span="6">
+            <el-form-item label="生产要求:" prop="productionRequirements">
+              <el-input
+                placeholder=" "
+                v-model="form.productionRequirements"
+                disabled
+              ></el-input>
+            </el-form-item>
+          </el-col>
           <!-- <el-col :span="6">
             <el-form-item label="所属工厂:" prop="factoriesId">
               <el-select v-model="form.factoriesId" style="width: 100%">

src/views/saleOrder/salesToProductionNewTwo.vue

@@ -229,7 +229,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-
+          <!-- 
           <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
             <el-form-item label="生产要求:" required>
               <el-input
@@ -240,7 +240,7 @@
                 disabled
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
 
           <!-- <el-form-item label="生产类型:" prop="produceType">
                 <el-select v-model="form.produceType" style="width: 100%"   @change="changeProduceType" >
@@ -369,6 +369,14 @@
             prop="productionCodes"
           >
           </el-table-column>
+          <el-table-column
+            label="生产要求"
+            align="center"
+            prop="productionRequirements"
+            width="240"
+
+          >
+          </el-table-column>
           <el-table-column
             :label="'欠交数量' + (clientEnvironmentId == '4' ? '(方)' : '')"
             align="center"

src/views/workOrder/index.vue

@@ -459,6 +459,13 @@
             minWidth: 150,
             showOverflowTooltip: true
           },
+          {
+            prop: 'productionRequirements',
+            label: '生产要求',
+            align: 'center',
+            minWidth: 200,
+            showOverflowTooltip: true
+          },
           {
             prop: 'brandNo',
             label: '牌号',
@@ -498,11 +505,11 @@
             prop: 'formingNum',
             label: '要求生产数量',
             formatter: (row) => {
-               if(row.measuringUnit){
-                   return `${row.formingNum} ${row.measuringUnit}`
-               }else{
-                 return row.formingNum
-               }
+              if (row.measuringUnit) {
+                return `${row.formingNum} ${row.measuringUnit}`;
+              } else {
+                return row.formingNum;
+              }
             },
             align: 'center',
             showOverflowTooltip: true,