Browse Source

在出入库申请页面添加源单行号字段

乐菲 2 weeks ago
parent
commit
b5dc3af13b

+ 0 - 42
.env.dev

@@ -1,42 +0,0 @@
-# 开发环境配置
-NODE_ENV = 'development'
-
-# 页面标题  WMS开发环境
-VUE_APP_TITLE = WMS开发环境
-
-# 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.1.94:48080'
-# VUE_APP_BASE_API = 'http://127.0.0.1:48080'
-# VUE_APP_BASE_API = 'http://113.105.183.190:42699'
-# VUE_APP_BASE_API = 'http://192.168.1.85:48080'
-# VUE_APP_ETM_URL = 'https://222jp79013zl.vicp.fun'
-# VUE_APP_ETM_URL = 'http://localhost:81/index'
-# VUE_APP_ETM_URL = 'http://192.168.1.163:8181/etm/'
-# VUE_APP_MES_URL = 'http://192.168.1.163:8181/mes/'
-# VUE_APP_WMS_URL = 'http://192.168.1.163:8181/wms/'
-# VUE_APP_SYSTEM_URL = 'http://192.168.1.163:8181/system/'
-
-# 报表IP
-VUE_APP_REPORT_API = 'http://113.105.183.190:48064'
-
-# 路由懒加载
-VUE_CLI_BABEL_TRANSPILE_MODULES = true
-
-# 多租户的开关
-VUE_APP_TENANT_ENABLE = true
-
-# 验证码的开关
-VUE_APP_CAPTCHA_ENABLE = true
-
-# 文档的开关
-VUE_APP_DOC_ENABLE = true
-
-# 百度统计
-VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab
-
-# PUBLIC_PATH = '/rtkwms/'
-
-VUE_APP_PRINTER_OPENID = 10000861
-VUE_APP_PRINTER_TOKENS = +fdBeHkvLvLW2tIeEVMWr2DikZtd9jOb
-
-# VUE_APP_APP_NAME = 'ccs/wms'

+ 19 - 15
src/views/rtkwms/inrequest/InRequestForm.vue

@@ -19,8 +19,8 @@
           ><el-form-item label="业务类型" prop="businessType">
             <el-select
               v-model="formData.businessType"
-              @change="changeBusinessType"
               placeholder="请选择业务类型"
+              @change="changeBusinessType"
             >
               <el-option
                 v-for="dict in getDictDatas('in_business_type')"
@@ -99,8 +99,7 @@
                 :key="item.sourceOrderNo"
                 :label="item.sourceOrderNo"
                 :value="item.sourceOrderNo"
-              >
-              </el-option>
+              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -152,8 +151,7 @@
                 :key="item.erpId"
                 :label="item.name"
                 :value="item.erpId"
-              >
-              </el-option>
+              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -173,6 +171,13 @@
           width="160"
           show-overflow-tooltip
         />
+        <el-table-column
+          label="源单行号"
+          align="center"
+          prop="sourceLineNo"
+          width="160"
+          show-overflow-tooltip
+        />
         <el-table-column
           label="物料编码"
           align="center"
@@ -203,8 +208,7 @@
                 :key="item.code"
                 :label="item.name"
                 :value="item.code + '-' + scope.$index"
-              >
-              </el-option>
+              />
             </el-select>
           </template>
         </el-table-column>
@@ -397,11 +401,11 @@ export default {
     },
     remoteMaterialName(query) {
       if (query !== "") {
-        let that = this;
+        const that = this;
         this.loading = true;
         setTimeout(async () => {
           this.loading = false;
-          let {
+          const {
             data: { list },
           } = await InRequestApi.getMaterialPage({
             name: query,
@@ -415,11 +419,11 @@ export default {
     },
     remoteMethod(query) {
       if (query !== "") {
-        let that = this;
+        const that = this;
         this.loading = true;
         setTimeout(async () => {
           this.loading = false;
-          let { data } = await InRequestApi.getSourceOrder({
+          const { data } = await InRequestApi.getSourceOrder({
             businessType: that.formData.businessType,
             sourceOrderNo: query,
             pageSize: 999,
@@ -440,11 +444,11 @@ export default {
     },
     remoteWarehouse(query) {
       if (query !== "") {
-        let that = this;
+        const that = this;
         this.loading = true;
         setTimeout(async () => {
           this.loading = false;
-          let {
+          const {
             data: { list },
           } = await InRequestApi.getStockPage({
             name: query,
@@ -464,7 +468,7 @@ export default {
       });
     },
     changeMaterialName(value) {
-      let data = value.split("-");
+      const data = value.split("-");
       this.materialNameList.map((v) => {
         if (v.code == data[0]) {
           v.materialNo = v.code;
@@ -486,7 +490,7 @@ export default {
         businessType: this.formData.businessType,
       };
       this.formData = { ...this.formData };
-      let { data } = await InRequestApi.getDictByOrderType({
+      const { data } = await InRequestApi.getDictByOrderType({
         orderType: this.formData.businessType,
       });
       this.businessDescribeList = data;

+ 19 - 15
src/views/wms/output/inrequest/components/InRequestForm.vue

@@ -19,8 +19,8 @@
           ><el-form-item label="业务类型" prop="businessType">
             <el-select
               v-model="formData.businessType"
-              @change="changeBusinessType"
               placeholder="请选择业务类型"
+              @change="changeBusinessType"
             >
               <el-option
                 v-for="dict in getDictDatas('inout_business_type')"
@@ -99,8 +99,7 @@
                 :key="item.sourceOrderNo"
                 :label="item.sourceOrderNo"
                 :value="item.sourceOrderNo"
-              >
-              </el-option>
+              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -152,8 +151,7 @@
                 :key="item.erpId"
                 :label="item.name"
                 :value="item.erpId"
-              >
-              </el-option>
+              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -173,6 +171,13 @@
           width="160"
           show-overflow-tooltip
         />
+        <el-table-column
+          label="源单行号"
+          align="center"
+          prop="sourceLineNo"
+          width="160"
+          show-overflow-tooltip
+        />
         <el-table-column
           label="物料编码"
           align="center"
@@ -203,8 +208,7 @@
                 :key="item.code"
                 :label="item.name"
                 :value="item.code + '-' + scope.$index"
-              >
-              </el-option>
+              />
             </el-select>
           </template>
         </el-table-column>
@@ -397,11 +401,11 @@ export default {
     },
     remoteMaterialName(query) {
       if (query !== "") {
-        let that = this;
+        const that = this;
         this.loading = true;
         setTimeout(async () => {
           this.loading = false;
-          let {
+          const {
             data: { list },
           } = await InRequestApi.getMaterialPage({
             name: query,
@@ -422,7 +426,7 @@ export default {
       this.formData = { ...this.formData };
     },
     changeMaterialName(value) {
-      let data = value.split("-");
+      const data = value.split("-");
       this.materialNameList.map((v) => {
         if (v.code == data[0]) {
           v.materialNo = v.code;
@@ -433,11 +437,11 @@ export default {
     },
     remoteMethod(query) {
       if (query !== "") {
-        let that = this;
+        const that = this;
         this.loading = true;
         setTimeout(async () => {
           this.loading = false;
-          let { data } = await InRequestApi.getSourceOrder({
+          const { data } = await InRequestApi.getSourceOrder({
             businessType: that.formData.businessType,
             sourceOrderNo: query,
           });
@@ -449,11 +453,11 @@ export default {
     },
     remoteWarehouse(query) {
       if (query !== "") {
-        let that = this;
+        const that = this;
         this.loading = true;
         setTimeout(async () => {
           this.loading = false;
-          let {
+          const {
             data: { list },
           } = await InRequestApi.getStockPage({
             name: query,
@@ -485,7 +489,7 @@ export default {
         businessType: this.formData.businessType,
       };
       this.formData = { ...this.formData };
-      let { data } = await InRequestApi.getDictByOrderType({
+      const { data } = await InRequestApi.getDictByOrderType({
         orderType: this.formData.businessType,
       });
       this.businessDescribeList = data;