合并本地

public/config.json

@@ -1,6 +1,6 @@
 {
-    "BASE_URL": "http://127.0.0.1:9906",
-    "SERVER_IP": "http://127.0.0.1:9906",
+    "BASE_URL": "http://127.0.0.1:9996",
+    "SERVER_IP": "http://127.0.0.1:9996",
     "hosp_name": "福建省XX市医院"
 }
 

src/views/basic/BussinessTypeLocl.vue

@@ -54,7 +54,7 @@
                     <template slot-scope="scope">
                         <el-button
                             type="text"
-                            size="small" :disabled="!configParms.typeBus"
+                            size="small" 
                             @click.native.stop="handleModifyClick(scope.row)"
                         >编辑
                         </el-button

src/views/basic/CorpMaintain.vue

@@ -447,6 +447,7 @@ export default {
         hideForm() {
             // 更改值
             this.formVisible = !this.formVisible;
+            this.getList();
             return true;
         },
         // 显示表单

src/views/basic/basicCompanyProductsImport.vue

@@ -967,6 +967,11 @@ export default {
                 this.$message.warning("请先选入产品！");
                 return;
             }
+            if (this.repEditQuery.price<0) {
+                this.$message.error("产品价格不能小于0元！");
+                return;
+            }
+
             selectData.forEach((obj) => {
                 this.postQuery.rlIds.push(obj.id);
             });

src/views/basic/invWarehouse.vue

@@ -27,7 +27,7 @@
                 <el-form-item>
                     <el-button-group style="margin-left: 10px;display:flex;">
                         <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                        <el-button type="primary" icon="search" @click="getList">查询</el-button>
+                        <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
                         <el-button type="primary" @click.native="handleForm(null, null,'addTop')"
                                    :disabled="!configParms.basicInv"
                         >添加仓库
@@ -56,6 +56,7 @@
                 style="width: 100%;margin-bottom: 20px;"
                 row-key="id"
                 border
+                ref="mergeTable"
                 highlight-current-row
                 @current-change="handInvCurrentChange">
                 <el-table-column label width="45">
@@ -907,7 +908,12 @@ export default {
             this.getList();
         },
         onSubmit() {
+            this.radioCheck=null;
+            this.subRadioCheck=null;
+             this.userQuery.page = 1;
+            this.busQuery.page = 1;
             this.getList();
+            this.$refs.mergeTable.setCurrentRow();
         },
         getList() {
             this.loading = true;
@@ -916,6 +922,9 @@ export default {
                     this.loading = false;
                     this.mergeList = response.data.list || [];
                     this.subList = [];
+                    this.userData  = [];
+                    this.bussinessTypeData = [];
+
                 })
                 .catch(() => {
                     this.loading = false;

src/views/inventory/InvProducts.vue

@@ -242,6 +242,15 @@ export default {
             this.getList();
         },
         onSubmit() {
+           
+            if(this.filterQuery.invStorageCode==null || this.filterQuery.invStorageCode==""){
+                this.$message.error("当前仓库不能为空");
+                return
+            }else if(this.filterQuery.invWarehouseCode==null || this.filterQuery.invWarehouseCode==""){
+                this.$message.error("当前分库不能为空");
+                return
+            }
+
             this.loading = true;
             this.filterQuery.page = 1;
             this.getList();
@@ -266,6 +275,8 @@ export default {
             this.getList();
         },
         getList() {
+          
+
             this.loading = true;
             this.filterQuery.customerId = store.getters.customerId;
             filterProducts(this.filterQuery)

src/views/thrsys/ThrOrdedrReceiveAdd.vue

@@ -156,6 +156,7 @@ export default {
                 corpName: null,
                 type: 1,
                 editStatus: 1,
+                thirdPartyDate:2,
             },
             formName: null,
             formMap: {
@@ -231,6 +232,7 @@ export default {
                 corpName: null,
                 type: 1,
                 editStatus: 1,
+                thirdPartyDate:2,
             };
             this.actDateRange = [];
             this.getList();

src/views/thrsys/ThrOrder.vue

@@ -232,6 +232,7 @@ export default {
         page: 1,
         limit: 10,
         corpName: null,
+        thirdPartyDate:1,
       };
       this.actDateRange = [];
       this.getList();

src/views/thrsys/thrOrderNew.vue

@@ -13,7 +13,7 @@
           >
           <el-button
               type="primary"
-              @click.native="saveOrder('0')"
+              @click.native="saveOrder('2')"
               :loading="loading"
           >提交单据
           </el-button
@@ -555,8 +555,11 @@ export default {
       let tQuery = this.formData;
       tQuery.editStatus = status;
       tQuery.subErpOrders = this.codeArray;
+      tQuery.thirdPartyDate = 2;
+      
       // tQuery.billType = this.formData.bi;
       console.log(tQuery);
+      debugger
       inserThrOrderWeb(tQuery)
           .then(response => {
             this.loading = false;

src/views/userManage/admin/authAdmin.vue

@@ -407,7 +407,7 @@ export default {
                     userName: row.userName,
                     checkPassword: "",
                     employeeName: row.employeeName,
-                    userFlag: 1,
+                    userFlag: row.userFlag,
                     comments: row.comments,
                     roles: row.roles,
                     dept: row.dept,
@@ -484,6 +484,7 @@ export default {
                                 this.$message.success("操作成功");
                                 // 刷新数据
                                 this.list.splice(index, 1);
+                                this.getList();
                             })
                             .catch(() => {
                                 this.deleteLoading = false;

src/views/userManage/admin/authRole.vue

@@ -465,9 +465,9 @@ export default {
             }
         },
         formSubmit() {
-
-
-            if (this.$isBlank(this.formData.name)) {
+            var regu = "^[ ]+$";
+            var re = new RegExp(regu);         
+            if (this.$isBlank(this.formData.name) || re.test(this.formData.name)) {
                 this.$message.error("请输入角色名称！");
                 return;
             }

src/views/warehouse/IOErrorOrder.vue

@@ -26,7 +26,7 @@
                 </el-form-item>
                 <el-form-item class="query-form-item">
                     <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
-                               @change="invChange"
+                               @change="invChangetwo"
                                size="mini">
                         <el-option
                             v-for="item in storageList"
@@ -579,6 +579,21 @@ export default {
                 });
         },
         invChange() {
+           
+            this.subInvList = [];
+         
+            let query = {
+                pcode: this.filterQuery.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+        invChangetwo() {
+           
            this.subInvList = [];
            this.filterQuery.invWarehouseCode = "";
            let query = {
@@ -613,8 +628,8 @@ export default {
         this.filterQuery = Object.assign(this.filterQuery, query);
         this.filterQuery.limit = parseInt(this.filterQuery.limit);
         // 加载表格数据
-
         this.getStorage();
+       
     },
 };
 </script>

src/views/warehouse/acceptOrder.vue

@@ -341,6 +341,7 @@ export default {
                         if (response.code == 20000) {
                             this.$message.success("验收成功！");
                             this.closeDialog();
+                            this.$emit('childByValue', 1)
                         } else {
                             this.$message.error(response.message);
                         }

src/views/warehouse/selectThrOrder.vue

@@ -148,6 +148,7 @@ export default {
                 originType: null,
                 page: 1,
                 limit: 10,
+                editStatus: 2,
                 customerId: null,
             },
             combineQuery: {

src/views/warehouse/stockHospOrderNew.vue

@@ -913,7 +913,7 @@ export default {
             this.selectProductVisible = false;
             this.selectInvProductVisible = false;
             this.thisData = {};
-
+            rData=rData.reverse();
             if (this.$isNotBlank(rData)) {
                 this.codeArray = [];
                 rData.forEach((obj, index) => {

src/views/warehouse/stockOrderEdit.vue

@@ -86,9 +86,7 @@
 
             <el-pagination
                 :page-size="detailQuery.limit"
-                :current-page="detailQuery.page"
-                :current-page.sync="detailQuery.page"
-                @current-change="handleCurrentChange"
+                @current-change="detailHandleCurrentChange"
                 layout="prev, pager, next"
                 :total="detailTotal"
             >
@@ -153,10 +151,6 @@ export default {
             type: Object,
             required: true,
         },
-        orderIdFk: {
-            type: String,
-            required: true,
-        }
     },
     data() {
         return {
@@ -272,8 +266,9 @@ export default {
                 }
             }
         },
-        handleCurrentChange(val) {
-            this.detailQuery.page = val;
+
+        detailHandleCurrentChange(val) {
+            this.query.page = val;
             this.getStockOrderDetailList();
         },
         getStockOrderDetailList(row) {
@@ -293,10 +288,6 @@ export default {
                 });
         },
     },
-    created() {
-        this.detailQuery.orderIdFk = this.orderIdFk;
-        this.getStockOrderDetailList();
-    }
 }
 </script>
 

src/views/warehouse/stockOrderNewSelectProduct.vue

@@ -309,6 +309,7 @@ export default {
             getStockOrderDetailInstrumentById(tQuery).then((response) => {
                 this.loading = false;
                 if (response.code === 20000) {
+                   
                     this.closeDialog(response.data);
                 } else {
                     this.$message.error(response.message);

src/views/warehouse/stockOrderSearch.vue

@@ -284,7 +284,7 @@
             <StockOrderEdit
                 :closeDialog="closeDialog"
                 :detailList="detailList"
-                :orderIdFk="detailQuery.orderIdFk"
+
             ></StockOrderEdit>
         </el-dialog>
 
@@ -473,6 +473,7 @@
             <acceptOrder
                 :closeDialog="closeAcceptDialog"
                 :orderQuery="acceptQuery"
+                v-on:childByValue="parentByFn"
             ></acceptOrder>
         </el-dialog>
 
@@ -673,6 +674,9 @@ export default {
                 }
             })
         },
+        parentByFn: function (childValue) {
+            this.getList();
+         },
         changeFun(row) {
             let _this = this;
             _this.multipId = []; //每次改动重置ID
@@ -946,7 +950,6 @@ export default {
         // 显示表单
         handleDetailForm(index, row) {
             this.stockOrderEditVisible = true;
-            this.detailQuery.orderIdFk = row.id;
         },
         hideDetailForm() {
             // 更改值