修改入库申请明细

.env.rtk.prod

@@ -6,15 +6,15 @@ VUE_APP_TITLE = 瑞泰克WMS开发环境
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://113.105.183.190:48028'
-VUE_APP_BASE_API = 'http://113.105.183.190:15980'
-# VUE_APP_BASE_API = 'http://192.168.1.32:48080'
+# VUE_APP_BASE_API = 'http://113.105.183.190:15980'
+VUE_APP_BASE_API = 'http://192.168.1.32:48080'
 # VUE_APP_BASE_API = 'http://113.105.183.190:48159'
 
 
 # 积木报表API
 # VUE_APP_REPORT_API = 'http://113.105.183.190:48028'
-VUE_APP_REPORT_API = 'http://113.105.183.190:15980'
-# VUE_APP_REPORT_API = 'http://192.168.1.32:48080'
+# VUE_APP_REPORT_API = 'http://113.105.183.190:15980'
+VUE_APP_REPORT_API = 'http://192.168.1.32:48080'
 # VUE_APP_REPORT_API = 'http://113.105.183.190:48159'
 
 

src/views/rtkwms/inrequest/InRequestForm.vue

@@ -224,6 +224,24 @@
               </el-form-item>
             </el-col>
             <el-col v-if="formData.businessType === '9'" :span="12">
+              <el-form-item label="扣料仓库" prop="originStockCode">
+                <el-select
+                  v-model="formData.originStockCode"
+                  :disabled="isFormDisabled || formData.businessType == null"
+                  placeholder="请选择扣料仓库"
+                  clearable
+                  filterable
+                >
+                  <el-option
+                    v-for="item in warehouseList"
+                    :key="item.erpId"
+                    :label="item.name"
+                    :value="item.code"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col v-if="formData.businessType === '9'" :span="12">
               <el-form-item label="委外发料单" prop="relatedOrder">
                 <el-select
                   v-model="formData.relatedOrder"
@@ -243,7 +261,7 @@
                   />
                 </el-select>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <!-- <el-col :span="12">
               <el-form-item label="源单编号" prop="sourceOrderNo">
                 <el-select
@@ -610,6 +628,7 @@ export default {
         businessDescribe: undefined,
         businessSubType: undefined,
         status: undefined,
+        originStockCode: undefined,
         priority: undefined,
         warehouseId: undefined,
         relatedWarehouseId: undefined,
@@ -745,9 +764,14 @@ export default {
           rules.sourceOrderNo = [
             { required: true, message: "源单编号不能为空", trigger: "blur" },
           ];
-          rules.relatedOrder = [
-            { required: true, message: "委外发料单不能为空", trigger: "blur" },
-          ];
+          if (businessType === "9") {
+            rules.originStockCode = [
+              { required: true, message: "扣料仓库不能为空", trigger: "blur" },
+            ];
+          }
+          // rules.relatedOrder = [
+          //   { required: true, message: "委外发料单不能为空", trigger: "blur" },
+          // ];
         }
         // 生产退料(3)需要的必填字段
         else if (businessType === "3") {
@@ -1290,6 +1314,7 @@ export default {
       this.formData = {
         id: undefined,
         // list: [],
+        originStockCode: undefined,
         relatedOrder: undefined,
         requestNo: undefined,
         requestType: undefined,