出库单据

ruoyi-ui/src/views/out/addOutStockout.vue

@@ -2,13 +2,23 @@
   <div class="app-container">
     <!-- 主表信息录入 -->
     <el-form :model="formData" ref="formRef" size="small" :inline="true" label-width="68px" :rules="rules">
-      <el-form-item :label="'仓库'" prop="warehouseId" required><!--仓库-->
-        <el-select v-model="formData.warehouseId" :placeholder="'请选择仓库'" clearable>
+<!--      <el-form-item :label="'仓库'" prop="warehouseId" required>&lt;!&ndash;仓库&ndash;&gt;-->
+<!--        <el-select v-model="formData.warehouseId" :placeholder="'请选择仓库'" clearable>-->
+<!--          <el-option-->
+<!--            v-for="dict in warehouseOptions"-->
+<!--            :key="dict.warehouseId"-->
+<!--            :label="dict.warehouseName"-->
+<!--            :value="dict.warehouseId"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item :label="'单据类型'" prop="outType" required><!--单据类型-->
+        <el-select v-model="formData.outType" :placeholder="'请选择单据类型'" clearable>
           <el-option
-            v-for="dict in warehouseOptions"
-            :key="dict.warehouseId"
-            :label="dict.warehouseName"
-            :value="dict.warehouseId"
+            v-for="dict in dict.type.out_bill_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
@@ -21,16 +31,7 @@
           readonly
         />
       </el-form-item>
-      <el-form-item :label="'单据类型'" prop="outType" required><!--单据类型-->
-        <el-select v-model="formData.outType" :placeholder="'请选择单据类型'" clearable>
-          <el-option
-            v-for="dict in dict.type.out_bill_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+
       <el-form-item>
         <el-button type="warning" icon="el-icon-refresh" size="mini" @click="reset">{{'重置'}}<!--重置--></el-button>
         <el-button type="success" icon="el-icon-check" size="mini" @click="handleSave" v-hasPermi="['out:outStockout:saveBill']">{{'保存单据'}}<!--保存单据--></el-button>
@@ -44,14 +45,29 @@
 
     <!-- 物资明细表格 -->
     <el-table v-loading="loading" :data="materialList">
-      <el-table-column :label="'物资编号'" align="left" prop="productId" /><!--物资编号-->
-      <el-table-column :label="'物资名称'" align="left" prop="productName" /><!--物资名称-->
+      <el-table-column :label="'品号'" align="center" prop="productId" /><!--物资编号-->
+      <el-table-column :label="'品名'" align="center" prop="productName" /><!--物资名称-->
+      <el-table-column label="批次号" align="center" prop="lotNo" />
+      <el-table-column label="订单号" align="center" prop="orderId" />
+      <el-table-column label="序列号" align="center" prop="printDate" />
 <!--      <el-table-column :label="$t('addOutStockout.batchNo')" align="left" prop="lotNo" />&lt;!&ndash;批号&ndash;&gt;-->
-      <el-table-column :label="'数量'" align="right" prop="quantity"><!--数量-->
+      <el-table-column :label="'数量'" align="center" prop="quantity" width="150"><!--数量-->
         <template slot-scope="scope">
           <el-input-number v-model="scope.row.quantity" :min="1" size="mini" @change="handleQuantityChange(scope.row)" />
         </template>
       </el-table-column>
+      <el-table-column label="规格" align="center" prop="spec" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="型号" align="center" prop="cargoNo" />
+      <el-table-column label="颜色" align="center" prop="price" />
+      <el-table-column label="电压" align="center" prop="voltage" />
+      <el-table-column label="功率" align="center" prop="power" />
+      <el-table-column label="相位" align="center" prop="phase" />
+      <el-table-column label="净重" align="center" prop="netWeight" />
+      <el-table-column label="毛重" align="center" prop="grossWeight" />
+      <el-table-column label="分销" align="center" prop="distribution" />
+      <el-table-column label="机型" align="center" prop="model" />
+
       <el-table-column :label="'操作'" align="center" class-name="small-padding fixed-width"><!--操作-->
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.$index)">{{'删除'}}<!--删除--></el-button>
@@ -62,22 +78,48 @@
     <!-- 选择物资弹窗 -->
     <el-dialog :title="'选择物资'" :visible.sync="materialDialog" width="800px" append-to-body><!--选择物资-->
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
-        <el-form-item :label="'物资编码'" prop="productId"><!--物资编码-->
+
+        <el-form-item :label="'品号'" prop="productId"><!--物资编码-->
           <el-input
             v-model="queryParams.productId"
-            :placeholder="'请输入物资编码'"
+            :placeholder="'请输入品号'"
             clearable
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item :label="'物资名称'" prop="productName"><!--物资名称-->
+        <el-form-item :label="'品名'" prop="productName"><!--物资名称-->
           <el-input
             v-model="queryParams.productName"
-            :placeholder="'请输入物资名称'"
+            :placeholder="'请输入品名'"
             clearable
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
+        <el-form-item label="规格" prop="spare1">
+          <el-input v-model="queryParams.spare1" placeholder="请输入规格"
+                    clearable
+                    @keyup.enter.native="handleQuery"/>
+        </el-form-item>
+        <el-form-item label="单位" prop="spare3">
+          <el-input v-model="queryParams.spare3" placeholder="请输入单位"
+                    clearable
+                    @keyup.enter.native="handleQuery"/>
+        </el-form-item>
+        <el-form-item label="型号" prop="spare4">
+          <el-input v-model="queryParams.spare4" placeholder="请输入型号"
+                    clearable
+                    @keyup.enter.native="handleQuery"/>
+        </el-form-item>
+        <el-form-item label="序列号" prop="spare6">
+          <el-input v-model="queryParams.spare6" placeholder="请输入序列号"
+                    clearable
+                    @keyup.enter.native="handleQuery"/>
+        </el-form-item>
+        <el-form-item label="订单号" prop="orderId">
+          <el-input v-model="queryParams.orderId" placeholder="请输入订单号"
+                    clearable
+                    @keyup.enter.native="handleQuery"/>
+        </el-form-item>
 
 
         <el-form-item>
@@ -88,10 +130,25 @@
 
       <el-table v-loading="materialLoading" :data="materialOptions" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column :label="'物资编码'" align="left" prop="productId" /><!--物资编码-->
-        <el-table-column :label="'物资名称'" align="left" prop="productName" /><!--物资名称-->
-        <el-table-column :label="'数量'" align="right" prop="quantity" /><!--数量-->
-        <el-table-column :label="'仓库'" align="left" prop="warehouseId" /><!--仓库-->
+        <el-table-column label="序号" align="center" prop="onlyIdentity" />
+        <el-table-column label="订单号" align="center" prop="orderId" />
+        <el-table-column label="品号" align="center" prop="productId" />
+        <el-table-column label="批次号" align="center" prop="lotNo" />
+        <el-table-column label="品名" align="center" prop="productName" />
+        <el-table-column label="数量" align="center" prop="quantity" />
+        <el-table-column label="仓库" align="center" prop="warehouseId" />
+        <el-table-column label="规格" align="center" prop="spare1" />
+        <el-table-column label="单位" align="center" prop="spare3" />
+        <el-table-column label="型号" align="center" prop="spare4" />
+        <el-table-column label="颜色" align="center" prop="spare5" />
+        <el-table-column label="序列号" align="center" prop="spare6" />
+        <el-table-column label="电压" align="center" prop="voltage" />
+        <el-table-column label="功率" align="center" prop="power" />
+        <el-table-column label="相位" align="center" prop="phase" />
+        <el-table-column label="净重" align="center" prop="netWeight" />
+        <el-table-column label="毛重" align="center" prop="grossWeight" />
+        <el-table-column label="分销" align="center" prop="distribution" />
+        <el-table-column label="机型" align="center" prop="model" />
       </el-table>
 
       <pagination
@@ -107,7 +164,7 @@
         <el-button @click="cancelSelectMaterials">{{'取消'}}<!--取 消--></el-button>
       </div>
     </el-dialog>
-    
+
     <!-- 选择客户弹窗 -->
     <el-dialog :title="'客户管理'" :visible.sync="customerDialog" width="800px" append-to-body>
       <el-form :model="customerQueryParams" ref="customerQueryForm" size="small" :inline="true" label-width="100px">
@@ -183,9 +240,9 @@ export default {
       customerTotal: 0,
       // 表单验证规则
       rules: {
-        warehouseId: [
-          { required: true, message: '请选择仓库', trigger: "change" }
-        ],
+        // warehouseId: [
+        //   { required: true, message: '请选择仓库', trigger: "change" }
+        // ],
         customerNo: [
           { required: true, message: '请输入客户编号', trigger: "blur" }
         ],
@@ -195,7 +252,7 @@ export default {
       },
       // 主表数据
       formData: {
-        warehouseId: null,
+        // warehouseId: null,
         customerNo: null,
         customerName: null, // 添加客户名称字段，用于显示
         outType: null
@@ -219,7 +276,20 @@ export default {
         lotNo: null,
         productName: null,
         quantity: null,
-        warehouseId: null
+        warehouseId: null,
+        spare1: null,
+        spare3: null,
+        spare4: null,
+        spare5: null,
+        spare6: null,
+        voltage: null,
+        power: null,
+        phase: null,
+        netWeight: null,
+        grossWeight: null,
+        distribution: null,
+        model: null,
+        orderId: null
       },
       // 客户选择弹窗
       customerDialog: false,
@@ -298,12 +368,12 @@ export default {
     },
     /** 打开选择物资弹窗 */
     handleSelectMaterials() {
-      if (!this.formData.warehouseId) {
-        this.$modal.msgError('请选择仓库');
-        return;
-      }
+      // if (!this.formData.warehouseId) {
+      //   this.$modal.msgError('请选择仓库');
+      //   return;
+      // }
       this.materialDialog = true;
-      this.queryParams.warehouseId = this.formData.warehouseId;
+      // this.queryParams.warehouseId = this.formData.warehouseId;
       this.getMaterialList();
     },
     /** 获取物资列表 */
@@ -341,6 +411,20 @@ export default {
           productName: item.productName,
           quantity: item.quantity,
           quantityOrignal: item.quantity,
+          voltage: item.voltage,
+          phase: item.phase,
+          power: item.power,
+          netWeight: item.netWeight,
+          grossWeight: item.grossWeight,
+          distribution: item.distribution,
+          model: item.model,
+          orderId: item.orderId,
+          unit: item.spare3,
+          spec: item.spare1,
+          cargoNo: item.spare4,
+          printDate:item.spare6,
+          price:item.spare5,
+          warehouseId: item.warehouseId,
           lotNo: item.lotNo,
           onlyIdentity: item.onlyIdentity
         }))
@@ -402,7 +486,7 @@ export default {
     /** 重置数据 */
     reset() {
       this.formData = {
-        warehouseId: null,
+        // warehouseId: null,
         customerNo: null,
         customerName: null,
         outType: null