前端bug修复

public/config.json

@@ -1,5 +1,7 @@
 {
+
     "BASE_URL":"http://139.159.187.130:8080/UDI_WMS_MC",
     "SERVER_IP": "http://139.159.187.130:8080/",
     "BASE_URL2": "ws://139.159.187.130:8080/UDI_WMS_MC/api/websocket/"
+
 }

src/api/basic/busLocalType.js

@@ -0,0 +1,26 @@
+import axios from "../../utils/axios";
+
+export function getLocalBusType(query) {
+    return axios({
+        url: "/udiwms/localBusType/filter",
+        method: "get",
+        params: query
+    });
+}
+
+export function deleteLocalBusType(query) {
+    return axios({
+        url: "/udiwms/localBusType/delete",
+        method: "post",
+        data: query
+    });
+}
+
+export function updateLocalBusType(query) {
+    return axios({
+        url: "/udiwms/localBusType/update",
+        method: "post",
+        data: query
+    });
+}
+

src/router/index.js

@@ -181,6 +181,16 @@ export const asyncRouterMap = [
                     authRule: ["admin/auth_permission_rule"]
                 }
             },
+            {
+                path: "/systemParam",
+                component: Empty,
+                name: "系统参数",
+                redirect: "/systemParam/systemParamConfig",
+                icon: "",
+                meta: {
+                    authRule: ["systemParam/systemParamConfig"]
+                },
+                children: [
                     {
                         path: "systemParamConfig",
                         component: systemParamConfig,
@@ -188,8 +198,26 @@ export const asyncRouterMap = [
                         icon: "",
                         meta: {
                             authRule: ["admin/systemParamConfig"]
+                        },
+                    },
+                    {
+                        path: "bussinessType",
+                        name: "单据类型",
+                        component: BussinessType,
+                        meta: {
+                            authRule: ["product/bussinessType"]
                         }
                     },
+                    {
+                        path: "thirdSys",
+                        name: "第三方参数设置",
+                        component: thirdSys,
+                        meta: {
+                            authRule: ["thrsys/thirdSys"]
+                        }
+                    },
+                    ]
+            },
             {
                 path: "systemPDFTemplate",
                 component: systemPDFTemplate,
@@ -199,14 +227,14 @@ export const asyncRouterMap = [
                     authRule: ["admin/system_pdf_template"]
                 }
             },
-            {
+            // {
-                path: "bussinessType",
+            //     path: "bussinessType",
-                name: "单据类型",
+            //     name: "单据类型",
-                component: BussinessType,
+            //     component: BussinessType,
-                meta: {
+            //     meta: {
-                    authRule: ["product/bussinessType"]
+            //         authRule: ["product/bussinessType"]
-                }
+            //     }
-            },
+            // },
         ]
     },
     {
@@ -584,14 +612,14 @@ export const asyncRouterMap = [
                     },]
             },
 
-            {
+            // {
-                path: "thirdSys",
+            //     path: "thirdSys",
-                name: "参数设置",
+            //     name: "参数设置",
-                component: thirdSys,
+            //     component: thirdSys,
-                meta: {
+            //     meta: {
-                    authRule: ["thrsys/thirdSys"]
+            //         authRule: ["thrsys/thirdSys"]
-                }
+            //     }
-            },
+            // },
 
         ]
     },

src/views/basic/BussinessType.vue

@@ -31,6 +31,7 @@
                     <span>{{ enableMap[scope.row.enable] }}</span>
                 </template>
             </el-table-column>
+            <el-table-column label="本地单据类型" prop="localAction" fixed></el-table-column>
             <el-table-column label="第三方系统" prop="thirdName" fixed></el-table-column>
 
             <el-table-column label="操作" fixed="right">
@@ -121,6 +122,7 @@
                     mainAction: "",
                     thirdSysFk: "",
                     id: "",
+                    localAction: null,
                 },
                 enableMap: {
                     true: "是",
@@ -218,6 +220,7 @@
                     name: row.name,
                     enable: row.enable,
                     mainAction: row.mainAction,
+                    localAction:row.localAction,
                     thirdSysFk: row.thirdSysFk,
                 };
             },

src/views/basic/BussinessTypeModify.vue

@@ -65,7 +65,27 @@
             </el-col>
         </el-row>
         <el-row :gutter="20" class="el-row" type="flex">
-            <el-col :span="24" class="el-col">
+
+            <el-col :span="10" class="el-col">
+                <div class="text item">
+                    <div class="itemTag">
+                        <span>本地单据:&nbsp;</span>
+                    </div>
+                    <el-select v-model="inputQuery.localAction" placeholder="请选择">
+                        <el-option
+                            v-for="item in localTypes"
+                            :key="item.action"
+                            :label="item.name"
+                            :value="item.action">
+                            <span style="float: left">{{ item.name }}</span>
+                            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>
+                        </el-option>
+                    </el-select>
+                </div>
+            </el-col>
+
+
+            <el-col :span="10" class="el-col">
                 <div class="text item">
                     <div class="itemTag">
                         <span>备注:&nbsp;</span>
@@ -97,6 +117,10 @@
         getBasicThirdSys,
     } from "../../api/basic/basicThirdSys";
 
+    import {
+        getLocalBusType,
+    } from "../../api/basic/busLocalType";
+
     export default {
         name: "inputQuery",
         props: {
@@ -110,8 +134,11 @@
             return {
                 filterQuery: {
                     enabled: true,
+                    isBuType:true,
                 },
                 thirdSys: [],
+                localTypes:[],
+
                 value: "",
             }
         },
@@ -125,11 +152,24 @@
                         this.loading = false;
                         this.list = [];
                     });
+                getLocalBusType(this.filterQuery)
+                    .then((response) => {
+                        this.localTypes = response.data.list || [];
+                    })
+                    .catch(() => {
+                        this.loading = false;
+                        this.localTypes = [];
+                    });
+            },
+
+            getLoca(){
+
             },
         },
 
         created() {
             this.getList();
+            this.getLoca();
         },
     };
 </script>

src/views/basic/UdiInfoManage.vue

@@ -343,7 +343,6 @@
                             </div>
                             <el-input
                                 style="width: 65%"
-                                :disabled="true"
                                 size="small"
                                 splaceholder="请输入内容"
                                 v-model="editQuery.sptm"
@@ -357,7 +356,6 @@
                             </div>
                             <el-input
                                 style="width: 65%"
-                                :disabled="true"
                                 size="small"
                                 splaceholder="请输入内容"
                                 v-model="editQuery.ybbm"
@@ -525,6 +523,7 @@
                         </div>
                     </el-col>
                 </el-row>
+
                 <el-row :gutter="20" class="el-row" type="flex">
                     <el-col :span="12" class="el-col">
                         <div class="text item">
@@ -540,6 +539,25 @@
                             ></el-input>
                         </div>
                     </el-col>
+                    <el-col :span="12" class="el-col">
+                        <div class="text item">
+                            <div class="itemTag">
+                                <span>生产厂家:&nbsp;</span>
+                            </div>
+                            <el-input
+                                style="width: 65%"
+                                :disabled="!checked"
+                                size="small"
+                                splaceholder="请输入内容"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+
+
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="12" class="el-col">
+                    </el-col>
                     <el-col :span="6" class="el-col">
                         <el-form-item prop="name">
                             <el-checkbox v-model="checked" class="text item itemTag"

src/views/inout/IOErpOrder.vue

@@ -21,6 +21,13 @@
                             <el-option label="未签字" value="0"></el-option>
                         </el-select>
                     </el-form-item>
+
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.isLocal" placeholder="单据位置">
+                            <el-option label="本地单据" value="1"></el-option>
+                            <el-option label="第三方单据" value="0"></el-option>
+                        </el-select>
+                    </el-form-item>
                     <el-form-item class="query-form-item">
             <span style="color: #000; margin-left: 10px; margin-right: 6px"
             >单据日期:</span
@@ -148,6 +155,7 @@
                     endDate: null,
                     page: 1,
                     limit: 5,
+                    isLocal:null,
                 },
                 value: "",
                 total: 0,
@@ -210,6 +218,7 @@
                     endDate: null,
                     page: 1,
                     limit: 5,
+                    isLocal:null,
                 };
                 this.actDateRange = [];
                 this.getList();

src/views/thrsys/ThrCorpsImport.vue

@@ -15,7 +15,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item class="query-form-item">
-                    <el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统">
+                    <el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统" @change="sysChange">
                         <el-option
                             v-for="item in thirdSys"
                             :key="item.value"
@@ -235,23 +235,32 @@
             genInCode() {
                 this.selectBasicUdiVisible = true;
             },
+            sysChange() {
+                this.getThirdSysDetail();
+                // console.log( this.thirdSysDetail.thirdId+"\n"+ this.thirdSysDetail.fromType+"\n"+this.thirdSysDetail.enable);
+            },
+
+
             handleDetailClick(row) {
                 this.currentRow = row;
                 console.log(this.currentRow.genKey)
                 this.udiImportDetailVisible = true;
 
-            },
+            }
+            ,
             cancelDialog(val) {
                 this.udiImportDetailVisible = false;
                 this.thrCorpSelectVisible = false;
                 if (val) {
                     this.getList();
                 }
-            },
+            }
+            ,
             handleCurrentChange(val) {
                 this.filterQuery.page = val;
                 this.getList();
-            },
+            }
+            ,
             deleteDialog(rowId) {
                 this.$confirm("此操作将删除该内部码信息, 是否继续?", "提示", {
                     confirmButtonText: "确定",
@@ -278,7 +287,8 @@
                     })
                     .catch(() => {
                     });
-            },
+            }
+            ,
             getBasicThirdSys() {
                 let query = {
                     enabled: true,
@@ -304,7 +314,8 @@
                 //
                 // });
 
-            },
+            }
+            ,
             selectSysParam() {
                 let query = {
                     key: "thirdIpUrl",
@@ -315,7 +326,8 @@
                         this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/corp/upload";
                     }
                 });
-            },
+            }
+            ,
             handleChange(response, files, fileList) {
                 console.log(response);
                 if (response.code != 20000) {
@@ -326,7 +338,8 @@
                     this.$message.success("文件上传成功,请稍后刷新查看！");
                     this.getList();
                 }
-            },
+            }
+            ,
             statusFilterType(status) {
                 const statusMap = {
                     0: "warning",
@@ -335,7 +348,8 @@
                     3: "success",
                 };
                 return statusMap[status];
-            },
+            }
+            ,
             getThirdSysDetail() {
                 let query = {
                     thirdSysFk: this.filterQuery.thirdSysFk,
@@ -354,10 +368,12 @@
                     this.templateDlUrl = response + "/第三方往来单位信息导入模板.xlsx";
                 });
 
-            },
+            }
+            ,
             jumpDl() {
                 window.open(this.templateDlUrl, '_blank');
-            },
+            }
+            ,
             downloadDatas() {
                 this.$confirm("此操作从第三方系统下载全部往来单位信息, 是否继续?", "提示", {
                     confirmButtonText: "确定",
@@ -377,7 +393,8 @@
                         this.getList();
                     });
                 });
-            },
+            }
+            ,
             formatterThirdSys(key) {
                 let data = null;
                 this.thirdSys.forEach((item, index) => {
@@ -386,7 +403,8 @@
                     }
                 });
                 return data;
-            },
+            }
+            ,
         },
 
         mounted() {

src/views/thrsys/ThrInvProducts.vue

@@ -4,13 +4,31 @@
             <el-form-item class="query-form-item">
                 <el-input
                     v-model="filterQuery.inventoryCode" clearable
-                    placeholder="存货编码"
+                    placeholder="产品编码"
                 ></el-input>
             </el-form-item>
             <el-form-item class="query-form-item">
                 <el-input
                     v-model="filterQuery.inventoryName" clearable
-                    placeholder="存货名称"
+                    placeholder="产品名称"
+                ></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+                <el-input
+                    v-model="filterQuery.spec" clearable
+                    placeholder="规格型号"
+                ></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+                <el-input
+                    v-model="filterQuery.registerCertNo" clearable
+                    placeholder="注册/备案凭证号"
+                ></el-input>
+            </el-form-item>
+            <el-form-item class="query-form-item">
+                <el-input
+                    v-model="filterQuery.manufactory" clearable
+                    placeholder="生厂厂家"
                 ></el-input>
             </el-form-item>
             <el-form-item class="query-form-item">
@@ -32,21 +50,6 @@
                     <el-button type="primary" icon="search" @click="clearAll"
                                v-if="!this.thirdSysDetail.enabled">清空全部
                     </el-button>
-                    <!--<el-upload-->
-                        <!--v-if="!this.thirdSysDetail.enabled"-->
-                        <!--:action="uploadFileUrl"-->
-                        <!--multiple-->
-                        <!--:limit="3"-->
-                        <!--:data="uploadData"-->
-                        <!--:show-file-list="false"-->
-                        <!--:on-success="handleChange"-->
-                        <!--:file-list="fileList"-->
-                    <!--&gt;-->
-                        <!--<el-button size="mini" type="primary">导入库存产品信息</el-button>-->
-                    <!--</el-upload>-->
-                    <!--<el-button type="primary" icon="search" @click="downloadDatas"-->
-                               <!--v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.itrCache">导入库存产品信息-->
-                    <!--</el-button>-->
                 </el-button-group>
             </el-form-item>
         </el-form>
@@ -56,12 +59,16 @@
             <el-table-column label="产品名称" prop="name" show-overflow-tooltip></el-table-column>
             <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
             <el-table-column label="批次号" prop="batchNo" show-overflow-tooltip></el-table-column>
-            <el-table-column label="仓位" prop="warehouseName" show-overflow-tooltip></el-table-column>
-            <el-table-column label="货位" prop="spaceName" show-overflow-tooltip></el-table-column>
-            <el-table-column label="注册证号" prop="registerCertNo" show-overflow-tooltip></el-table-column>
             <el-table-column label="生产日期" prop="manufacturingDate" show-overflow-tooltip></el-table-column>
             <el-table-column label="失效日期" prop="expirationDate" show-overflow-tooltip></el-table-column>
             <el-table-column label="数量" prop="count" show-overflow-tooltip></el-table-column>
+            <el-table-column label="注册证号" prop="registerCertNo" show-overflow-tooltip></el-table-column>
+            <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
+            <el-table-column label="仓位" prop="warehouseName" show-overflow-tooltip></el-table-column>
+            <el-table-column label="货位" prop="spaceName" show-overflow-tooltip></el-table-column>
+
+
+
             <el-table-column label="操作" fixed="right" v-if="thirdSysDetail.fromType!=0">
                 <template slot-scope="scope">
                     <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
@@ -95,7 +102,7 @@
                     inventoryName: null,
                     thirdSys: null,
                     page: 1,
-                    limit: 20,
+                    limit: 100,
                 },
                 total: 0,
                 list: [],

src/views/thrsys/ThrInvProductsExport.vue

@@ -77,6 +77,7 @@
             title="导出库存产品信息"
             :visible.sync="thrInvProductsSelectVisible"
             width="85%"
+            close-on-click-modal="false"
             v-if="thrInvProductsSelectVisible"
         >
             <thrInvProductsSelect :selectType="selectType"  v-on:cancelDialog="cancelDialog"

src/views/thrsys/ThrInvProductsImport.vue

@@ -15,7 +15,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item class="query-form-item">
-                    <el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统" @change="thirdSysChange">
+                    <el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统" @change="sysChange">
                         <el-option
                             v-for="item in thirdSys"
                             :key="item.value"
@@ -232,6 +232,10 @@
                         this.total = 0;
                     });
             },
+            sysChange() {
+                this.getThirdSysDetail();
+                // console.log( this.thirdSysDetail.thirdId+"\n"+ this.thirdSysDetail.fromType+"\n"+this.thirdSysDetail.enable);
+            },
 
             genInCode() {
                 this.selectBasicUdiVisible = true;

src/views/thrsys/ThrOrder.vue

@@ -47,18 +47,22 @@
                         >
                         </el-date-picker>
                     </el-form-item>
-                    <el-form-item class="query-form-item">
+                    <!--<el-form-item class="query-form-item">-->
-                        <el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统">
+                        <!--<el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统">-->
-                            <el-option
+                            <!--<el-option-->
-                                v-for="item in thirdSys"
+                                <!--v-for="item in thirdSys"-->
-                                :key="item.value"
+
-                                :label="item.thirdName"
+
-                                :value="item.thirdId">
+
-                                <span style="float: left">{{ item.thirdName }}</span>
+
-                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+                                <!--:key="item.value"-->
-                            </el-option>
+                                <!--:label="item.thirdName"-->
-                        </el-select>
+                                <!--:value="item.thirdId">-->
-                    </el-form-item>
+                                <!--<span style="float: left">{{ item.thirdName }}</span>-->
+                                <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>-->
+                            <!--</el-option>-->
+                        <!--</el-select>-->
+                    <!--</el-form-item>-->
                     <el-form-item>
                         <el-button-group style="display:flex;">
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>

src/views/thrsys/ThrOrderImport.vue

@@ -16,7 +16,7 @@
                 </el-form-item>
 
                 <el-form-item class="query-form-item">
-                    <el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统">
+                    <el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统"  @change="sysChange">
                         <el-option
                             v-for="item in thirdSys"
                             :key="item.value"
@@ -238,9 +238,13 @@
                 this.currentRow = row;
                 console.log(this.currentRow.genKey)
                 this.udiImportDetailVisible = true;
+            },
 
-
+            sysChange() {
+                this.getThirdSysDetail();
+                // console.log( this.thirdSysDetail.thirdId+"\n"+ this.thirdSysDetail.fromType+"\n"+this.thirdSysDetail.enable);
             },
+
             cancelDialog(val) {
                 this.udiImportDetailVisible = false;
                 this.thrOrderSelectVisible = false;

src/views/thrsys/ThrOrderSelect.vue

@@ -44,18 +44,18 @@
                         >
                         </el-date-picker>
                     </el-form-item>
-                    <el-form-item class="query-form-item">
+                    <!--<el-form-item class="query-form-item">-->
-                        <el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统">
+                        <!--<el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统">-->
-                            <el-option
+                            <!--<el-option-->
-                                v-for="item in thirdSys"
+                                <!--v-for="item in thirdSys"-->
-                                :key="item.value"
+                                <!--:key="item.value"-->
-                                :label="item.thirdName"
+                                <!--:label="item.thirdName"-->
-                                :value="item.thirdId">
+                                <!--:value="item.thirdId">-->
-                                <span style="float: left">{{ item.thirdName }}</span>
+                                <!--<span style="float: left">{{ item.thirdName }}</span>-->
-                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>
+                                <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>-->
-                            </el-option>
+                            <!--</el-option>-->
-                        </el-select>
+                        <!--</el-select>-->
-                    </el-form-item>
+                    <!--</el-form-item>-->
                     <el-form-item>
                         <el-button-group style="display:flex;">
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>

src/views/thrsys/ThrProductsImport.vue

@@ -15,7 +15,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item class="query-form-item">
-                    <el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统" @change="thirdSysChange">
+                    <el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统" @change="sysChange">
                         <el-option
                             v-for="item in thirdSys"
                             :key="item.value"
@@ -254,6 +254,11 @@
                     this.getList();
                 }
             },
+            sysChange() {
+                this.getThirdSysDetail();
+                // console.log( this.thirdSysDetail.thirdId+"\n"+ this.thirdSysDetail.fromType+"\n"+this.thirdSysDetail.enable);
+            },
+
             handleCurrentChange(val) {
                 this.filterQuery.page = val;
                 this.getList();