Răsfoiți Sursa

feat(saleOrder): 创建订单表格升级ele-pro-table并完善必填校验提示

- 创建订单弹窗产品列表升级为ele-pro-table,支持刷新/尺寸/列管理/全屏,新增产品按钮移入工具栏左侧
- 创建订单处理BOM/工艺路线/所属工厂补必填校验,校验失败提示并自动滚动聚焦到未填位置
- 创建订单关闭弹窗时重置数据,修复数据残留
- 临时生产计划新增销售订单入口(非必填),选择后自动带出客户名称,保存支持salesCode
- 表单布局调整为生产编号/客户名称换位、统一small尺寸、gutter对齐
- 临时生产计划、销售订单转生产计划两处新增圆形图标改为工具栏按钮
lihaiting 3 ore în urmă
părinte
comite
2a5387a195

+ 99 - 105
src/views/productionPlan/components/factoryAdd/index.vue

@@ -22,7 +22,7 @@
             <el-form-item label="计划编号:" prop="code">
               <el-input
                 placeholder="计划编号"
-                size="mini"
+                size="small"
                 disabled
                 v-model="form.code"
               ></el-input>
@@ -34,7 +34,7 @@
                 v-model="form.planType"
                 style="width: 100%"
                 @change="changeProduceType"
-                size="mini"
+                size="small"
               >
                 <el-option
                   v-for="item of planTypeList"
@@ -47,44 +47,58 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item label="批次号:" prop="batchNo">
-              <el-input
-                placeholder="输入批次号"
-                size="mini"
-                v-model="form.batchNo"
-              ></el-input>
+            <el-form-item
+              label="计划开始日期:"
+              label-width="110px"
+              prop="startTime"
+            >
+              <el-date-picker
+                style="width: 100%"
+                size="small"
+                v-model="form.startTime"
+                @change="handleStartTimeChange(form)"
+                type="datetime"
+                placeholder="选择开始日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="客户名称:">
-              <el-input
-                clearable
-                v-model="form.customerName"
-                style="width: calc(100% - 80px)"
-              />
-
-              <contactDialog
-                style="margin-left: 3px"
-                @changeParent="contactDialogSuccess"
-              ></contactDialog>
+            <el-form-item
+              label="计划结束日期:"
+              label-width="110px"
+              prop="endTime"
+            >
+              <el-date-picker
+                style="width: 100%"
+                size="small"
+                v-model="form.endTime"
+                @change="handleEndTimeChange(form)"
+                type="datetime"
+                placeholder="选择结束日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              >
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
 
-        <el-row :gutter="24">
-          <el-col :span="6" v-if="isSaleOrder">
+        <el-row :gutter="10">
+          <el-col :span="6">
             <el-form-item label="销售订单号:" prop="saleOrder">
               <div class="sale-order-select">
                 <el-input
                   v-model="form.saleOrder"
-                  size="mini"
+                  size="small"
                   type="text"
-                  style="width: calc(100% - 54px)"
+                  style="width: calc(100% - 50px)"
                   placeholder="请选择销售订单号"
                   readonly
+                  clearable
                 ></el-input>
                 <el-button
-                  size="mini"
+                  size="small"
                   type="primary"
                   @click="openSaleOrderDialog"
                 >
@@ -95,55 +109,44 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item
-              label="生产编号:"
-              label-width="110px"
-              prop="productionCodes"
-            >
+            <el-form-item label="客户名称:">
               <el-input
-                v-model="form.productionCodes"
-                size="mini"
-                type="text"
-                style="width: 100%"
-                placeholder=" "
-              ></el-input>
+                clearable
+                v-model="form.customerName"
+                size="small"
+                style="width: calc(100% - 50px)"
+                placeholder="请选择客户名称"
+              />
+
+              <contactDialog
+                style="margin-left: 3px"
+                size="small"
+                @changeParent="contactDialogSuccess"
+              ></contactDialog>
             </el-form-item>
           </el-col>
-
           <el-col :span="6">
-            <el-form-item
-              label="计划开始日期:"
-              label-width="110px"
-              prop="startTime"
-            >
-              <el-date-picker
-                style="width: 100%"
-                size="mini"
-                v-model="form.startTime"
-                @change="handleStartTimeChange(form)"
-                type="datetime"
-                placeholder="选择日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
+            <el-form-item label="批次号:" prop="batchNo">
+              <el-input
+                placeholder="请输入批次号"
+                size="small"
+                v-model="form.batchNo"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item
-              label="计划结束日期:"
+              label="生产编号:"
               label-width="110px"
-              prop="endTime"
+              prop="productionCodes"
             >
-              <el-date-picker
+              <el-input
+                v-model="form.productionCodes"
+                size="small"
+                type="text"
                 style="width: 100%"
-                size="mini"
-                v-model="form.endTime"
-                @change="handleEndTimeChange(form)"
-                type="datetime"
-                placeholder="选择日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
+                placeholder="请输入生产编号"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -154,7 +157,7 @@
             >
               <el-date-picker
                 style="width: 100%"
-                size="mini"
+                size="small"
                 v-model="form.reqMoldTime"
                 type="datetime"
                 placeholder="选择日期"
@@ -174,7 +177,7 @@
             >
               <el-date-picker
                 style="width: 100%"
-                size="mini"
+                size="small"
                 v-model="form.reqMoldTime"
                 type="datetime"
                 placeholder="选择日期"
@@ -199,6 +202,17 @@
             key="id"
             @columns-change="handleColumnChange"
           >
+            <template v-slot:toolbar>
+              <el-button
+                type="primary"
+                size="small"
+                icon="el-icon-plus"
+                @click="addEquipment"
+                v-if="!form.id"
+              >
+                新增
+              </el-button>
+            </template>
             <template v-slot:modelKey="{ row, $index }">
               <el-select
                 clearable
@@ -290,7 +304,7 @@
                 v-model="row.weight"
                 style="width: 100%"
                 @change="changeProduceType"
-                size="mini"
+                size="small"
               >
                 <el-option
                   v-for="item of weightList"
@@ -310,7 +324,7 @@
                 v-model="row.isSlotting"
                 style="width: 100%"
                 @change="changeProduceType"
-                size="mini"
+                size="small"
               >
                 <el-option
                   v-for="item of isSlotting"
@@ -329,7 +343,7 @@
               <DictSelection
                 dictName="开槽类型"
                 v-model="row.slottingType"
-                size="mini"
+                size="small"
               >
               </DictSelection>
             </template>
@@ -363,7 +377,7 @@
                   <el-button
                     v-show="isSelectShow"
                     type="primary"
-                    size="mini"
+                    size="small"
                     @click="openDialog($index)"
                     >选择</el-button
                   >
@@ -474,9 +488,6 @@
               >
             </template>
           </ele-pro-table>
-          <div class="add-product" @click="addEquipment" v-if="!form.id">
-            <i class="el-icon-circle-plus-outline"></i>
-          </div>
         </el-row>
       </el-form>
 
@@ -909,19 +920,7 @@
           saleOrder: [
             {
               validator: (rule, value, callback) => {
-                if (!this.isSaleOrder) {
-                  callback();
-                  return;
-                }
-                if (
-                  value === undefined ||
-                  value === null ||
-                  String(value).trim() === ''
-                ) {
-                  callback(new Error('请选择销售订单号'));
-                } else {
-                  callback();
-                }
+                callback();
               },
               trigger: ['blur', 'change']
             }
@@ -1052,14 +1051,13 @@
         val.planType = String(val.planType);
         this.form = await getUpdateInfoByCode(val.code);
 
-        if (this.isSaleOrder) {
-          const salesCode = this.form.salesCode;
-          this.$set(
-            this.form,
-            'saleOrder',
-            Array.isArray(salesCode) ? salesCode.join(',') : salesCode || ''
-          );
-        }
+        // 回显销售订单号(如果有)
+        const salesCode = this.form.salesCode;
+        this.$set(
+          this.form,
+          'saleOrder',
+          Array.isArray(salesCode) ? salesCode.join(',') : salesCode || ''
+        );
 
         if (val.id) {
           await this.initEditProductList(val);
@@ -1449,6 +1447,10 @@
       chooseSaleOrder(list) {
         const currentRow = list[0] || {};
         this.$set(this.form, 'saleOrder', currentRow.orderNo || '');
+        // 选择销售订单后自动带出客户名称
+        if (currentRow.partaName) {
+          this.$set(this.form, 'customerName', currentRow.partaName);
+        }
         this.$nextTick(() => {
           this.$refs.form && this.$refs.form.validateField('saleOrder');
         });
@@ -1564,8 +1566,11 @@
           if (isAdd) {
             this.form.timeDimensionPlanType = this.type;
           }
-          if (this.isSaleOrder) {
-            this.form.salesCode = this.form.saleOrder.split(',');
+          // 销售订单号(可选),有值则拆分存为 salesCode 数组
+          if (this.form.saleOrder) {
+            this.form.salesCode = this.form.saleOrder
+              .split(',')
+              .filter((item) => item.trim());
           }
 
           this.loading = true;
@@ -1969,17 +1974,6 @@
     gap: 4px;
   }
 
-  .add-product {
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    font-size: 30px;
-    color: #1890ff;
-    margin: 10px 0;
-    cursor: pointer;
-  }
-
   .header_required {
     .is-required:before {
       content: '*';

+ 482 - 443
src/views/saleOrder/components/create-order.vue

@@ -6,6 +6,7 @@
       width="80vw"
       append-to-body
       :maxable="true"
+      @close="cancel"
     >
       <el-form
         ref="form"
@@ -180,464 +181,328 @@
           </el-col> -->
         </el-row>
 
-        <el-table :data="form.productInfoList" border height="40vh" key="id">
-          <el-table-column label="序号" align="center" width="60">
-            <template slot-scope="scope">
-              <span>{{ scope.$index + 1 }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="行号" align="center" prop="lineNumber">
-          </el-table-column>
-          <el-table-column
-            label="名称"
-            align="center"
-            prop="productName"
-            width="150"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-          <el-table-column
-            label="编码"
-            align="center"
-            prop="productCode"
-            width="150"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-          <el-table-column label="牌号" align="center" prop="brandNo">
-          </el-table-column>
-          <el-table-column label="型号" align="center" prop="model">
-          </el-table-column>
-          <el-table-column
-            label="规格"
-            align="center"
-            prop="specification"
-            width="150"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-          <el-table-column label="单重" align="center" prop="productUnitWeight">
-          </el-table-column>
-          <el-table-column label="重量单位" align="center" prop="weightUnit">
-          </el-table-column>
-          <el-table-column
-            label="机型"
-            align="center"
-            prop="modelKey"
-            width="240"
-          >
-            <template slot-scope="scope">
-              <el-form-item
-                label-width="0px"
-                :prop="'productInfoList.' + scope.$index + '.modelKey'"
-              >
-                <el-select
-                  clearable
-                  v-model="scope.row.modelKey"
-                  filterable
-                  allow-create
-                  default-first-option
-                  :disabled="isOrderSource"
-                >
-                  <el-option
-                    v-for="item in scope.row.modelList"
-                    :key="item"
-                    :value="item"
-                    :label="item"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="颜色"
-            align="center"
-            prop="colorKey"
-            width="240"
-          >
-            <template slot-scope="scope">
-              <el-form-item
-                label-width="0px"
-                :prop="'productInfoList.' + scope.$index + '.colorKey'"
-              >
-                <el-select
-                  clearable
-                  v-model="scope.row.colorKey"
-                  filterable
-                  allow-create
-                  default-first-option
-                  :disabled="isOrderSource"
-                >
-                  <el-option
-                    v-for="item in scope.row.colorList"
-                    :key="item"
-                    :value="item"
-                    :label="item"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="生产编号"
-            align="center"
-            prop="productionCodes"
-            width="140"
-          >
-            <template slot-scope="scope">
-              <el-form-item
-                label-width="0px"
-                :prop="'productInfoList.' + scope.$index + '.productionCodes'"
+        <ele-pro-table
+          ref="tableRef"
+          :columns="columns"
+          :datasource="form.productInfoList"
+          :need-page="false"
+          :cache-key="cacheKeyUrl"
+          :toolkit="['reload', 'size', 'columns', 'fullscreen']"
+          border
+          height="40vh"
+          key="id"
+          @columns-change="handleColumnChange"
+        >
+          <template v-slot:toolbar>
+            <el-button
+              type="primary"
+              size="small"
+              icon="el-icon-plus"
+              @click="addEquipment"
+              v-if="isAdd && !isOrderSource"
+            >
+              新增产品
+            </el-button>
+          </template>
+          <template v-slot:modelKey="{ row, $index }">
+            <el-form-item
+              label-width="0px"
+              :prop="'productInfoList.' + $index + '.modelKey'"
+            >
+              <el-select
+                clearable
+                v-model="row.modelKey"
+                filterable
+                allow-create
+                default-first-option
+                :disabled="isOrderSource"
               >
-                <el-input
-                  style="width: 100%"
-                  size="small"
-                  v-model="scope.row.productionCodes"
-                  placeholder="请输入"
-                  :disabled="isOrderSource"
+                <el-option
+                  v-for="item in row.modelList"
+                  :key="item"
+                  :value="item"
+                  :label="item"
                 >
-                </el-input>
-              </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-option>
+              </el-select>
+            </el-form-item>
+          </template>
+          <template v-slot:colorKey="{ row, $index }">
+            <el-form-item
+              label-width="0px"
+              :prop="'productInfoList.' + $index + '.colorKey'"
+            >
+              <el-select
+                clearable
+                v-model="row.colorKey"
+                filterable
+                allow-create
+                default-first-option
+                :disabled="isOrderSource"
               >
-                <el-input
-                  style="width: 100%"
-                  size="small"
-                  v-model="scope.row.productionRequirements"
-                  placeholder="请输入"
-                  type="textarea"
-                  disabled
+                <el-option
+                  v-for="item in row.colorList"
+                  :key="item"
+                  :value="item"
+                  :label="item"
                 >
-                </el-input>
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="批次号"
-            align="center"
-            prop="batchNo"
-            width="140"
-          >
-            <template slot-scope="scope">
-              <el-form-item
-                label-width="0px"
-                :prop="'productInfoList.' + scope.$index + '.batchNo'"
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </template>
+          <template v-slot:productionCodes="{ row, $index }">
+            <el-form-item
+              label-width="0px"
+              :prop="'productInfoList.' + $index + '.productionCodes'"
+            >
+              <el-input
+                style="width: 100%"
+                size="small"
+                v-model="row.productionCodes"
+                placeholder="请输入"
+                :disabled="isOrderSource"
               >
-                <el-input
-                  style="width: 100%"
-                  size="small"
-                  v-model="scope.row.batchNo"
-                  placeholder="请输入"
-                  :disabled="isOrderSource"
-                  @input="
-                    (value) =>
-                      (scope.row.batchNo = value.replace(/[^a-zA-Z0-9_-]/g, ''))
-                  "
-                >
-                </el-input>
-              </el-form-item>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="订单数量"
-            width="140"
-            align="center"
-            prop="contractNum"
-          >
-            <template slot="header" slot-scope="scope">
-              <div class="header_required"
-                ><span class="is-required">订单数量</span></div
+              </el-input>
+            </el-form-item>
+          </template>
+          <template v-slot:productionRequirements="{ row, $index }">
+            <el-form-item
+              label-width="0px"
+              :prop="'productInfoList.' + $index + '.productionRequirements'"
+            >
+              <el-input
+                style="width: 100%"
+                size="small"
+                v-model="row.productionRequirements"
+                placeholder="请输入"
+                type="textarea"
+                disabled
               >
-            </template>
-            <template slot-scope="scope">
-              <el-form-item
-                label-width="0px"
-                :prop="'productInfoList.' + scope.$index + '.contractNum'"
-                :rules="{
-                  required: true,
-                  message: '请输入订单数量',
-                  trigger: 'blur'
-                }"
+              </el-input>
+            </el-form-item>
+          </template>
+          <template v-slot:batchNo="{ row, $index }">
+            <el-form-item
+              label-width="0px"
+              :prop="'productInfoList.' + $index + '.batchNo'"
+            >
+              <el-input
+                style="width: 100%"
+                size="small"
+                v-model="row.batchNo"
+                placeholder="请输入"
+                :disabled="isOrderSource"
+                @input="
+                  (value) => (row.batchNo = value.replace(/[^a-zA-Z0-9_-]/g, ''))
+                "
               >
-                <el-input
-                  v-model.number="scope.row.contractNum"
-                  size="small"
-                  type="number"
-                  style="width: 100%"
-                  placeholder="输入数量"
-                  :disabled="isOrderSource"
-                  @input="inputNumber(scope.row, scope.$index)"
-                ></el-input>
-              </el-form-item>
-            </template>
-          </el-table-column>
+              </el-input>
+            </el-form-item>
+          </template>
+          <template v-slot:headerContractNum="{ column }">
+            <div class="header_required"
+              ><span class="is-required">{{ column.label }}</span></div
+            >
+          </template>
+          <template v-slot:contractNum="{ row, $index }">
+            <el-form-item
+              label-width="0px"
+              :prop="'productInfoList.' + $index + '.contractNum'"
+              :rules="{
+                required: true,
+                message: '请输入订单数量',
+                trigger: 'blur'
+              }"
+            >
+              <el-input
+                v-model.number="row.contractNum"
+                size="small"
+                type="number"
+                style="width: 100%"
+                placeholder="输入数量"
+                :disabled="isOrderSource"
+                @input="inputNumber(row, $index)"
+              ></el-input>
+            </el-form-item>
+          </template>
 
-          <el-table-column
-            label="BOM类型"
-            width="140"
-            align="center"
-            prop="productType"
-          >
-            <template slot="header" slot-scope="scope">
-              <div :class="isRequired ? 'header_required' : ''"
-                ><span class="is-required">BOM类型</span></div
-              >
-            </template>
-            <template slot-scope="scope">
-              <el-form-item
-                label-width="0px"
-                :prop="'productInfoList.' + scope.$index + '.productType'"
+          <template v-slot:headerProcessingBOM="{ column }">
+            <div :class="isRequired ? 'header_required' : ''"
+              ><span class="is-required">{{ column.label }}</span></div
+            >
+          </template>
+          <template v-slot:productType="{ row, $index }">
+            <el-form-item
+              label-width="0px"
+              :prop="'productInfoList.' + $index + '.productType'"
+              :rules="[
+                {
+                  required: isRequired,
+                  message: '请选择生产类型',
+                  trigger: 'change'
+                }
+              ]"
+            >
+              <el-select
+                v-model="row.productType"
+                @change="changeProductType(row, $index)"
+                :key="$index"
+                :disabled="!isAdd && !isOrderSource"
               >
-                <el-select
-                  v-model="scope.row.productType"
-                  @change="changeProductType(scope.row, scope.$index)"
-                  :key="scope.$index"
-                  :disabled="!isAdd && !isOrderSource"
-                >
-                  <el-option
-                    v-for="item of scope.row.producedList"
-                    :key="scope.$index + item.code"
-                    :label="item.name"
-                    :value="item.code"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </template>
-          </el-table-column>
+                <el-option
+                  v-for="item of row.producedList"
+                  :key="$index + item.code"
+                  :label="item.name"
+                  :value="item.code"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </template>
 
-          <el-table-column
-            :label-class-name="isRequired ? 'header_required' : ''"
-            label="BOM版本"
-            width="140"
-            align="center"
-            prop="bomCategoryId"
-            v-if="clientEnvironmentId != 4"
-          >
-            <template slot="header" slot-scope="scope">
-              <div :class="isRequired ? 'header_required' : ''"
-                ><span class="is-required">BOM版本</span></div
-              >
-            </template>
-            <template slot-scope="scope">
-              <el-form-item
-                label-width="0px"
-                :prop="'productInfoList.' + scope.$index + '.bomCategoryId'"
-                :key="scope.$index"
+          <template v-slot:bomCategoryId="{ row, $index }">
+            <el-form-item
+              label-width="0px"
+              :prop="'productInfoList.' + $index + '.bomCategoryId'"
+              :key="$index"
+            >
+              <el-select
+                v-model="row.bomCategoryId"
+                @change="changeBomId(row, $index)"
+                :disabled="!isAdd && !isOrderSource"
               >
+                <el-option
+                  v-for="item of row.bomVersionList"
+                  :key="item.id"
+                  :label="item.name + '(V' + item.versions + '.0)'"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </template>
+
+          <template v-slot:produceRoutingId="{ row, $index }">
+            <el-form-item
+              label-width="0px"
+              :prop="'productInfoList.' + $index + '.produceRoutingId'"
+              :rules="[
+                {
+                  required: clientEnvironmentId != 4,
+                  message: '请选择工艺路线',
+                  trigger: 'change'
+                }
+              ]"
+            >
+              <div style="display: flex">
                 <el-select
-                  v-model="scope.row.bomCategoryId"
-                  @change="changeBomId(scope.row, scope.$index)"
-                  :disabled="!isAdd && !isOrderSource"
+                  v-model="row.produceRoutingId"
+                  @change="changeRoutingList(row, $index)"
+                  v-show="isRouteSelect(row)"
                 >
                   <el-option
-                    v-for="item of scope.row.bomVersionList"
+                    v-for="item of row.routingList"
                     :key="item.id"
-                    :label="item.name + '(V' + item.versions + '.0)'"
+                    :label="item.name"
                     :value="item.id"
                   ></el-option>
                 </el-select>
-              </el-form-item>
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            label="工艺路线"
-            width="240"
-            align="center"
-            prop="produceRoutingId"
-            v-if="clientEnvironmentId != 4"
-          >
-            <template slot="header" slot-scope="scope">
-              <div class="header_required"
-                ><span class="is-required">工艺路线</span></div
-              >
-            </template>
-            <template slot-scope="scope">
-              <el-form-item
-                label-width="0px"
-                :prop="'productInfoList.' + scope.$index + '.produceRoutingId'"
-              >
                 <div style="display: flex">
-                  <el-select
-                    v-model="scope.row.produceRoutingId"
-                    @change="changeRoutingList(scope.row, scope.$index)"
-                    v-show="isRouteSelect(scope.row)"
+                  <el-input
+                    v-show="!isRouteSelect(row)"
+                    disabled
+                    v-model="row.produceRoutingName"
+                  ></el-input>
+                  <el-button
+                    v-show="isSelectShow"
+                    type="primary"
+                    size="mini"
+                    @click="openDialog($index)"
+                    >选择</el-button
                   >
-                    <el-option
-                      v-for="item of scope.row.routingList"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.id"
-                    ></el-option>
-                  </el-select>
-                  <div style="display: flex">
-                    <el-input
-                      v-show="!isRouteSelect(scope.row)"
-                      disabled
-                      v-model="scope.row.produceRoutingName"
-                    ></el-input>
-                    <el-button
-                      v-show="isSelectShow"
-                      type="primary"
-                      size="mini"
-                      @click="openDialog(scope.$index)"
-                      >选择</el-button
-                    >
-                  </div>
                 </div>
-              </el-form-item>
-            </template>
-          </el-table-column>
+              </div>
+            </el-form-item>
+          </template>
 
-          <el-table-column
-            label="工艺路线"
-            align="center"
-            prop="produceRoutingName"
-            v-if="clientEnvironmentId == 4"
-          >
-            <template slot-scope="scope">
-              <el-form-item
-                label-width="0px"
-                :prop="
-                  'productInfoList.' + scope.$index + '.produceRoutingName'
-                "
-              >
-                <el-input
-                  v-model="form.produceRoutingName"
-                  style="width: 100%"
-                  :readonly="!isOrderSource"
-                ></el-input>
-              </el-form-item>
-            </template>
-          </el-table-column>
+          <template v-slot:produceRoutingName="{ row, $index }">
+            <el-form-item
+              label-width="0px"
+              :prop="'productInfoList.' + $index + '.produceRoutingName'"
+            >
+              <el-input
+                v-model="form.produceRoutingName"
+                style="width: 100%"
+                :readonly="!isOrderSource"
+              ></el-input>
+            </el-form-item>
+          </template>
 
-          <el-table-column
-            label="所属工厂"
-            width="140"
-            align="center"
-            prop="factoriesId"
-          >
-            <template slot="header" slot-scope="scope">
-              <div class="header_required"
-                ><span class="is-required">所属工厂</span></div
+          <template v-slot:headerProduceRoutingId="{ column }">
+            <div class="header_required"
+              ><span class="is-required">{{ column.label }}</span></div
+            >
+          </template>
+          <template v-slot:factoriesId="{ row, $index }">
+            <el-form-item
+              label-width="0px"
+              :prop="'productInfoList.' + $index + '.factoriesId'"
+              :rules="[
+                { required: true, message: '请选择所属工厂', trigger: 'change' }
+              ]"
+            >
+              <el-select
+                v-model="row.factoriesId"
+                :key="row.factoriesId"
+                @change="(e) => factorChange(e, row)"
               >
-            </template>
-            <template slot-scope="scope">
-              <el-form-item label-width="0px">
-                <el-select
-                  v-model="scope.row.factoriesId"
-                  :key="scope.row.factoriesId"
-                  @change="(e) => factorChange(e, scope.row)"
-                >
-                  <el-option
-                    v-for="item of factoryList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  ></el-option>
-                </el-select>
-              </el-form-item>
-            </template>
-          </el-table-column>
-
-          <el-table-column label="计量单位" align="center" prop="measuringUnit">
-          </el-table-column>
-          <el-table-column
-            label="模数"
-            align="center"
-            width="100"
-            v-if="clientEnvironmentId == '4'"
-          >
-            <template slot-scope="scope">
-              <div>
-                <el-input
-                  style="width: 100%"
-                  size="small"
-                  v-model="scope.row.moCount"
-                  oninput="value=value.replace(/[^0-9.]/g,'')"
-                  @input="
-                    tableHandleKeyUp(scope.row, scope.$index, $event, 'moCount')
-                  "
-                  placeholder="请输入"
-                  :disabled="isOrderSource"
-                >
-                </el-input>
-              </div>
-            </template>
-          </el-table-column>
+                <el-option
+                  v-for="item of factoryList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </template>
 
-          <el-table-column
-            align="center"
-            width="100"
-            label="块数"
-            v-if="clientEnvironmentId == '4'"
-          >
-            <template slot-scope="scope">
-              <div>
-                <el-input
-                  size="small"
-                  style="width: 100%"
-                  @input="
-                    tableHandleKeyUp(
-                      scope.row,
-                      scope.$index,
-                      $event,
-                      'blockCount'
-                    )
-                  "
-                  v-model="scope.row.blockCount"
-                  placeholder="请输入"
-                  :disabled="isOrderSource"
-                ></el-input>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column label="订单重量" align="center" prop="productWeight">
-            <template slot-scope="{ row }">
-              <span>{{ row.productWeight ? row.productWeight : '-' }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" width="160">
-            <template slot-scope="scope">
-              <!-- <el-link
-                type="primary"
-                :underline="false"
-                @click="homogeneityInspect(scope.row)"
-              >
-                齐套性检查
-              </el-link> -->
-              <el-button
-                type="text"
-                @click="handleDeleteItem(scope.$index)"
-                v-if="!scope.row.id && !isOrderSource"
-                >删除</el-button
+          <template v-slot:moCount="{ row, $index }">
+            <div>
+              <el-input
+                style="width: 100%"
+                size="small"
+                v-model="row.moCount"
+                oninput="value=value.replace(/[^0-9.]/g,'')"
+                @input="tableHandleKeyUp(row, $index, $event, 'moCount')"
+                placeholder="请输入"
+                :disabled="isOrderSource"
               >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div
-          class="add-product"
-          @click="addEquipment"
-          v-if="isAdd && !isOrderSource"
-        >
-          <i class="el-icon-circle-plus-outline"></i>
-        </div>
+              </el-input>
+            </div>
+          </template>
+
+          <template v-slot:blockCount="{ row, $index }">
+            <div>
+              <el-input
+                size="small"
+                style="width: 100%"
+                @input="tableHandleKeyUp(row, $index, $event, 'blockCount')"
+                v-model="row.blockCount"
+                placeholder="请输入"
+                :disabled="isOrderSource"
+              ></el-input>
+            </div>
+          </template>
+          <template v-slot:productWeight="{ row }">
+            <span>{{ row.productWeight ? row.productWeight : '-' }}</span>
+          </template>
+          <template v-slot:action="{ row, $index }">
+            <el-button
+              type="text"
+              @click="handleDeleteItem($index)"
+              v-if="!row.id && !isOrderSource"
+              >删除</el-button
+            >
+          </template>
+        </ele-pro-table>
       </el-form>
       <template v-slot:footer>
         <el-button @click="cancel">取消</el-button>
@@ -693,8 +558,10 @@
   import { multiply } from '@/utils/math';
   import contactDialog from '@/components/contactDialog/openContactDialog.vue';
   import { getByCode } from '@/api/system/dictionary-data';
+  import tableColumnsMixin from '@/mixins/tableColumnsMixin';
   export default {
     name: 'CreateOrder',
+    mixins: [tableColumnsMixin],
     components: {
       EquipmentDialog,
       orderHomogeneityInspectDialog,
@@ -714,6 +581,8 @@
         visible: false,
         loading: false,
         disabledList: [], //已保存数据不做删除
+        cacheKeyUrl: 'aps-saleOrder-createOrder-productInfo',
+        columnsVersion: 1,
         form: {
           salesman: '',
           salesmanId: '',
@@ -800,6 +669,164 @@
       // }
     },
     computed: {
+      // 产品信息表格列配置(ele-pro-table 表头管理/列缓存用)
+      columns() {
+        // 依赖 columnsVersion,列配置从服务端同步回来后能重新计算并生效
+        const num = this.columnsVersion;
+        const isClient4 = this.clientEnvironmentId == 4;
+        return [
+          {
+            columnKey: 'index',
+            label: '序号',
+            type: 'index',
+            width: 60,
+            align: 'center',
+            showOverflowTooltip: true
+          },
+          { prop: 'lineNumber', label: '行号', align: 'center' },
+          {
+            prop: 'productName',
+            label: '名称',
+            align: 'center',
+            width: 150,
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'productCode',
+            label: '编码',
+            align: 'center',
+            width: 150,
+            showOverflowTooltip: true
+          },
+          { prop: 'brandNo', label: '牌号', align: 'center' },
+          { prop: 'model', label: '型号', align: 'center' },
+          {
+            prop: 'specification',
+            label: '规格',
+            align: 'center',
+            width: 150,
+            showOverflowTooltip: true
+          },
+          { prop: 'productUnitWeight', label: '单重', align: 'center' },
+          { prop: 'weightUnit', label: '重量单位', align: 'center' },
+          {
+            slot: 'modelKey',
+            prop: 'modelKey',
+            label: '机型',
+            align: 'center',
+            width: 240
+          },
+          {
+            slot: 'colorKey',
+            prop: 'colorKey',
+            label: '颜色',
+            align: 'center',
+            width: 240
+          },
+          {
+            slot: 'productionCodes',
+            prop: 'productionCodes',
+            label: '生产编号',
+            align: 'center',
+            width: 140
+          },
+          {
+            slot: 'productionRequirements',
+            prop: 'productionRequirements',
+            label: '生产要求',
+            align: 'center',
+            width: 200,
+            show: this.title == '修改订单'
+          },
+          {
+            slot: 'batchNo',
+            prop: 'batchNo',
+            label: '批次号',
+            align: 'center',
+            width: 140
+          },
+          {
+            slot: 'contractNum',
+            prop: 'contractNum',
+            headerSlot: 'headerContractNum',
+            label: '订单数量',
+            align: 'center',
+            width: 140
+          },
+          {
+            slot: 'productType',
+            prop: 'productType',
+            headerSlot: 'headerProcessingBOM',
+            label: 'BOM类型',
+            align: 'center',
+            width: 140
+          },
+          {
+            slot: 'bomCategoryId',
+            prop: 'bomCategoryId',
+            headerSlot: 'headerProcessingBOM',
+            label: 'BOM版本',
+            align: 'center',
+            width: 140,
+            show: !isClient4
+          },
+          {
+            slot: 'produceRoutingId',
+            prop: 'produceRoutingId',
+            headerSlot: 'headerProduceRoutingId',
+            label: '工艺路线',
+            align: 'center',
+            width: 240,
+            show: !isClient4
+          },
+          {
+            slot: 'produceRoutingName',
+            prop: 'produceRoutingName',
+            label: '工艺路线',
+            align: 'center',
+            show: isClient4
+          },
+          {
+            slot: 'factoriesId',
+            prop: 'factoriesId',
+            headerSlot: 'headerProduceRoutingId',
+            label: '所属工厂',
+            align: 'center',
+            width: 140
+          },
+          { prop: 'measuringUnit', label: '计量单位', align: 'center' },
+          {
+            slot: 'moCount',
+            prop: 'moCount',
+            label: '模数',
+            align: 'center',
+            width: 100,
+            show: isClient4
+          },
+          {
+            slot: 'blockCount',
+            prop: 'blockCount',
+            label: '块数',
+            align: 'center',
+            width: 100,
+            show: isClient4
+          },
+          {
+            slot: 'productWeight',
+            prop: 'productWeight',
+            label: '订单重量',
+            align: 'center'
+          },
+          {
+            slot: 'action',
+            prop: 'action',
+            label: '操作',
+            align: 'center',
+            width: 160,
+            fixed: 'right'
+          }
+        ];
+      },
       // 是否开启响应式布局
       styleResponsive() {
         return this.$store.state.theme.styleResponsive;
@@ -1009,6 +1036,7 @@
 
       cancel() {
         this.isOrderSource = false;
+        this.disabledList = [];
         this.form = {
           salesmanId: '',
           salesman: '',
@@ -1132,6 +1160,23 @@
       save() {
         this.$refs.form.validate((valid) => {
           if (!valid) {
+            this.$message.warning('请完善必填项!');
+            // 自动滚动到第一个校验失败的位置并聚焦输入框
+            this.$nextTick(() => {
+              const errorItem = document.querySelector(
+                '.create-form .el-form-item.is-error'
+              );
+              if (errorItem) {
+                errorItem.scrollIntoView({
+                  behavior: 'smooth',
+                  block: 'center'
+                });
+                const input = errorItem.querySelector('input, textarea');
+                if (input) {
+                  input.focus();
+                }
+              }
+            });
             return false;
           }
 
@@ -1584,21 +1629,15 @@
     margin: 10px 0;
   }
 
-  .add-product {
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    font-size: 30px;
-    color: #1890ff;
-    margin: 10px 0;
-    cursor: pointer;
-  }
-
   .create-form .el-form-item {
     margin-bottom: 15px !important;
   }
 
+  /* 表格单元格内的表单项去掉下边距,避免行距过高 */
+  .create-form .ele-pro-table .el-form-item {
+    margin-bottom: 0 !important;
+  }
+
   .header_required {
     .is-required:before {
       content: '*';

+ 11 - 14
src/views/saleOrder/salesToProductionNewTwo.vue

@@ -354,6 +354,17 @@
           @columns-change="handleColumnChange"
           @refresh="handleTableRefresh"
         >
+          <template v-slot:toolbar>
+            <el-button
+              type="primary"
+              size="small"
+              icon="el-icon-plus"
+              @click="addEquipment"
+              v-if="type != 'edit'"
+            >
+              追加订单
+            </el-button>
+          </template>
           <template v-slot:contractNum="{ row }">
             {{ row.contractNum }}
             {{ row.measuringUnit }}
@@ -669,9 +680,6 @@
             >
           </template>
         </ele-pro-table>
-        <div class="add-product" @click="addEquipment" v-if="type != 'edit'">
-          <i class="el-icon-circle-plus-outline"></i>
-        </div>
         <el-row :gutter="24">
           <el-col v-bind="styleResponsive ? { lg: 24, md: 24 } : { span: 24 }">
             <el-form-item label="计划备注:">
@@ -2254,17 +2262,6 @@
     margin-bottom: 20px;
   }
 
-  .add-product {
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    font-size: 30px;
-    color: #1890ff;
-    margin: 10px 0;
-    cursor: pointer;
-  }
-
   .table-item {
     margin-bottom: 0;
   }