1.修复部分页面格式问题，字段未对应问题，分页bug

src/views/basic/basicCompany.vue

@@ -127,7 +127,7 @@
                     <!--</el-col>-->
                 </el-row>
 
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: -10px">
+                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
                     <el-col :span="10" class="el-col">
                         <el-form-item label="企业类别:" label-width="150px" prop="classes">
                             <el-select
@@ -158,7 +158,7 @@
                     </el-col>
                 </el-row>
 
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: -10px">
+                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
                     <el-col :span="10" class="el-col">
                         <el-form-item label="联系人:" label-width="150px" prop="contacts">
                             <el-input
@@ -183,7 +183,7 @@
                     </el-col>
                 </el-row>
 
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: -10px">
+                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
                     <el-col :span="10" class="el-col">
                         <el-form-item label="联系电话:" label-width="150px" prop="mobile">
                             <el-input
@@ -208,7 +208,7 @@
                     </el-col>
                 </el-row>
 
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: -10px">
+                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
                     <el-col :span="10" class="el-col">
                         <el-form-item label="证件类型:" label-width="150px" prop="contactsPapersType">
                             <el-select
@@ -235,7 +235,7 @@
                     </el-col>
                 </el-row>
 
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: -10px">
+                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
                     <el-col :span="10" class="el-col">
                         <el-form-item label="登记状态:" label-width="150px" prop="registerStatus">
                             <el-select
@@ -265,7 +265,7 @@
                     </el-col>
                 </el-row>
 
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: -10px">
+                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
                     <el-col :span="10" class="el-col">
                         <el-form-item label="经营许可证发证机关:" label-width="150px" prop="jyxkzfzjg">
                             <el-input
@@ -285,13 +285,14 @@
                                 type="date"
                                 placeholder="选择日期"
                                 :disabled="companyEditDisabled"
+                                value-format="yyyy-MM-dd"
                             >
                             </el-date-picker>
                         </el-form-item>
                     </el-col>
                 </el-row>
 
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: -10px">
+                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
                     <el-col :span="10" class="el-col">
                         <el-form-item label="经营备案凭证号:" label-width="150px" prop="jybapzh">
                             <el-input
@@ -316,7 +317,7 @@
                     </el-col>
                 </el-row>
 
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: -10px">
+                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
                     <el-col :span="10" class="el-col">
                         <el-form-item label="发证日期:" label-width="150px" prop="fzrq">
                             <el-date-picker
@@ -325,6 +326,7 @@
                                 type="date"
                                 placeholder="选择日期"
                                 :disabled="companyEditDisabled"
+                                value-format="yyyy-MM-dd"
                             >
                             </el-date-picker>
                         </el-form-item>
@@ -342,7 +344,7 @@
                     </el-col>
                 </el-row>
 
-                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: -10px">
+                <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 0px">
                     <el-col :span="10" class="el-col">
                         <el-form-item label="开户行:" label-width="150px" prop="kaihuhang">
                             <el-input
@@ -856,6 +858,7 @@ export default {
                 filePath3: "",
                 filePath4: "",
             },
+            oldData: {},
             headers: {},
             classesDisplay: false,
             selectedOptions: [],
@@ -1045,7 +1048,6 @@ export default {
                     }).catch(() => {
                     });
                 } else {
-                    console.log("error submit!!");
                     return false;
                 }
             });
@@ -1073,7 +1075,6 @@ export default {
                     }).catch(() => {
                     });
                 } else {
-                    console.log("error submit!!");
                     return false;
                 }
             });
@@ -1085,6 +1086,7 @@ export default {
             } else {
                 this.companyEditDisabled = true;
                 this.companyEditButtonStr = "编辑";
+                this.getData();
             }
         },
         addUpdateLog(formName) {
@@ -1109,7 +1111,6 @@ export default {
                     }).catch(() => {
                     });
                 } else {
-                    console.log("error submit!!");
                     return false;
                 }
             });
@@ -1120,7 +1121,6 @@ export default {
                 customerId: store.getters.customerId,
             };
             getCompany(tquery).then((response) => {
-                console.log(response)
                 this.loading = false;
                 this.inputQuery = response.data;
                 this.inputQuery.bussinessStatus = this.inputQuery.bussinessStatus + "";
@@ -1375,11 +1375,8 @@ export default {
             this.inputQuery.areaCode = value.toString();
         },
         uploadHandleRemove(file, fileList) {
-            console.log(file, fileList);
         },
         uploadHandlePreview(file) {
-            console.log(file);
-            console.log(this.fileList);
         },
         uploadHandleExceed(files, fileList) {
             this.$message.warning(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
@@ -1411,7 +1408,6 @@ export default {
             return isLt;
         },
         uploadHandleSuccess(response, file, fileList) {
-            console.log(response)
             if (response.code === 20000) {
                 this.uploadFilePath('', response.data.name);
 
@@ -1433,7 +1429,6 @@ export default {
             }
         },
         uploadHandleSuccess2(response, file, fileList) {
-            console.log(response)
             if (response.code === 20000) {
                 this.uploadFilePath('2', response.data.name);
 
@@ -1454,7 +1449,6 @@ export default {
             }
         },
         uploadHandleSuccess3(response, file, fileList) {
-            console.log(response)
             if (response.code === 20000) {
                 this.uploadFilePath('3', response.data.name);
 
@@ -1473,7 +1467,6 @@ export default {
             }
         },
         uploadHandleSuccess4(response, file, fileList) {
-            console.log(response)
             if (response.code === 20000) {
                 this.uploadFilePath('4', response.data.name);
 

src/views/basic/basicCompanyProducts.vue

@@ -47,7 +47,7 @@
                     <el-form-item>
                         <el-button-group>
                             <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="search">查询</el-button>
                             <el-button
                                 type="primary"
                                 icon="search"
@@ -1526,6 +1526,10 @@ export default {
             };
             this.getList();
         },
+        search() {
+            this.filterQuery.page = 1;
+            this.getList();
+        },
         getList() {
             this.loading = true;
             this.getProductRelevanceList();

src/views/inventory/invUdiTraceOrder.vue

@@ -644,7 +644,6 @@ export default {
         refresgOrderDetail() {
             orderDetail(this.detailQuery)
                 .then((response) => {
-                    console.log(response)
                     this.loading = false;
                     this.detailList = response.data || [];
                 })

src/views/thrsys/ThrProductsSubmit.vue

@@ -50,7 +50,7 @@
                 <el-form-item>
                     <el-button-group style="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="search">查询</el-button>
                         <el-button type="primary" @click="addProductVisible=true">新增</el-button>
                     </el-button-group>
                 </el-form-item>
@@ -190,6 +190,10 @@ export default {
             };
             this.getList();
         },
+        search() {
+            this.filterQuery.page = 1;
+            this.getList();
+        },
         checDialog(row) {
             this.checkVisible = true;
             this.curRow = row;

src/views/userManage/customerManage.vue

@@ -153,6 +153,7 @@
                                         size="small"
                                         style="width: 40%"
                                         type="number"
+                                        @change="verifyUserCount"
                                     ></el-input>
                                 </el-form-item>
                             </div>
@@ -578,6 +579,12 @@ export default {
                 .catch(() => {
                 });
         },
+        verifyUserCount(val) {
+            if (val < 0) {
+                this.$message.error("用户数不得小于0！");
+                this.formData.userMax = 0;
+            }
+        },
     },
     components: {
         customerUser,

src/views/userManage/userAccountManage.vue

@@ -87,6 +87,7 @@
             @current-change="handleCurrentChange"
             layout="prev, pager, next"
             :total="total"
+            :current-page="query.page"
         >
         </el-pagination>
 
@@ -148,6 +149,22 @@
                         </div>
                     </el-col>
                 </el-row>
+
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="10" class="el-col">
+                        <div class="text item">
+                            <div class="text item">
+                                <el-form-item label="备注" prop="comments">
+                                    <el-input
+                                        type="text"
+                                        size="small"
+                                        v-model="formData.comments"
+                                    ></el-input>
+                                </el-form-item>
+                            </div>
+                        </div>
+                    </el-col>
+                </el-row>
             </el-form>
             <div slot="footer" class="dialog-footer">
                 <el-button @click.native="hideForm" size="small">取消</el-button>
@@ -281,6 +298,7 @@ export default {
                 path: "",
                 query: this.query,
             });
+            this.query.page = 1;
             this.getList();
         },
         handleCurrentChange(val) {

src/views/warehouse/DialogSelectErpOrder.vue

@@ -261,6 +261,7 @@ export default {
                 this.filterQuery.startDate = null;
                 this.filterQuery.endDate = null;
             }
+            this.filterQuery.page = 1;
             this.getList();
         },
         getList() {

src/views/warehouse/DialogSelectInvStorage.vue

@@ -69,6 +69,14 @@ export default {
         }
     },
     methods: {
+        onReset() {
+            this.query = {
+                key: "",
+                page: 1,
+                limit: 20
+            }
+            this.list = [];
+        },
         getList() {
             this.loading = true;
             filterAll(this.query)
@@ -81,7 +89,6 @@ export default {
                 });
         },
         selectStorage(row) {
-            console.log(row.id);
             this.$emit("selectStorage", row);
         },
     },

src/views/warehouse/IOCheckErrOrder.vue

@@ -697,6 +697,7 @@ export default {
                 this.filterQuery.startTime = null;
                 this.filterQuery.endTime = null;
             }
+            this.filterQuery.page = 1;
             this.getList();
         },
         bindRl(val) {

src/views/warehouse/IOSearchOrder.vue

@@ -366,6 +366,8 @@
             :visible.sync="codeDetailVisible"
             width="80%"
             v-if="codeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <codeDetail
                 :idQuery="idQuery"
@@ -491,7 +493,10 @@ export default {
             },
             detailQuery: {
                 orderId: "",
+                page: 1,
+                limit: 20
             },
+            detailTotal: 0,
             deleteData: {
                 id: "",
             },
@@ -608,7 +613,6 @@ export default {
             this.getList();
         },
         handleSelectionChange(val) {
-            console.log(val);
             this.multipleSelection = val;
         },
         getStorage() {
@@ -738,7 +742,6 @@ export default {
             this.filterQuery.customerId = store.getters.customerId;
             filterOrder(this.filterQuery)
                 .then((response) => {
-                    console.log(response)
                     this.loading = false;
                     this.list = response.data.list || [];
                     this.detailList = [];
@@ -786,7 +789,6 @@ export default {
         refresgOrderDetail() {
             orderDetail(this.detailQuery)
                 .then((response) => {
-                    console.log(response)
                     this.loading = false;
                     this.detailList = response.data || [];
                 })
@@ -823,7 +825,6 @@ export default {
             this.successOrderExportPDFSettingVisible = true;
         },
         successOrderExportPDF(row) {
-            console.log(row)
             let tQuery = {
                 orderId: row.id,
                 customerId: store.getters.customerId
@@ -858,7 +859,6 @@ export default {
         },
 
         selectUnit(row) {
-            console.log(row.id);
             this.unitUpdateQuery.id = this.curIndex;
             this.unitUpdateQuery.fromCorp = row.name;
             this.unitUpdateQuery.fromCorpId = row.unitid;

src/views/warehouse/IOWaitOrder.vue

@@ -380,6 +380,8 @@
             :visible.sync="codeDetailVisible"
             width="80%"
             v-if="codeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <codeDetail
                 :idQuery="idQuery"
@@ -400,36 +402,28 @@
 
 <script>
 import {
-    orderList,
-    codeList,
-    findAllByOrderId,
     updateUnit,
     filterOrder,
     deleteByOrderId,
-    updateExportStatus,
     uploadOrder,
     mergeOrder,
     orderDetail,
 } from "../../api/warehouse/order";
 import {
-    orderDetailPDFFromTemplateCode,
     orderDetailPDFFromTemplateFile,
-    inspectionOrderDetailPDFFromTemplateCode,
     inspectionOrderDetailPDFFromTemplateFile
 } from "../../api/itextpdf/itextpdf";
 import {repeatCheck} from "../../api/erp/erpOrder";
 import {unitListBykey} from "../../api/warehouse/unit";
 import draggable from "vuedraggable";
-import {saveAs} from "file-saver";
 import codeDetail from "./code";
 import store from "../../store";
 import successOrderExportPDFSetting from "./successOrderExportPDF";
-import {downloadInoutOrderSuccessPDF} from "../../api/itextpdf/itextpdf";
 import selectErpOrder from "./DialogSelectErpOrder";
-import {getBussinessType} from "../../api/basic/bussinessType";
 import {filterAllByUser} from "@/api/basic/invWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busLocalType";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
+import {isBlank} from "@/utils/strUtil";
 
 const formJson = {
     site_id: "",
@@ -613,6 +607,13 @@ export default {
                 this.filterQuery.startTime = null;
                 this.filterQuery.endTime = null;
             }
+
+            if (!isBlank(this.filterQuery.invWarehouseCode)) {
+                if (isBlank(this.filterQuery.locStorageCode)) {
+                    this.$message.warning("请选择仓库！");
+                    return;
+                }
+            }
             this.getList();
         },
         handleSizeChange(val) {
@@ -1010,12 +1011,16 @@ export default {
             let query = {
                 pcode: this.filterQuery.locStorageCode
             };
-            filterSubByInv(query)
+            if (isBlank(this.filterQuery.locStorageCode)) {
-                .then((response) => {
+                this.subInvList = [];
-                    this.subInvList = response.data || [];
+            } else {
-                })
+                filterSubByInv(query)
-                .catch(() => {
+                    .then((response) => {
-                });
+                        this.subInvList = response.data || [];
+                    })
+                    .catch(() => {
+                    });
+            }
         },
 
 

src/views/warehouse/code.vue

@@ -7,7 +7,7 @@
 
             <el-form-item>
                 <el-button-group>
-                    <el-button type="primary" icon="search" @click="getCodeList"
+                    <el-button type="primary" icon="search" @click="search"
                     >查询
                     </el-button
                     >
@@ -129,7 +129,10 @@ export default {
             this.query.page = val;
             this.getCodeList();
         },
-
+        search() {
+            this.query.page = 1;
+            this.getCodeList();
+        },
         getCodeList() {
             this.loading = true;
             this.query.corpOrderId = this.idQuery.id;

src/views/warehouse/codeReplace.vue

@@ -7,7 +7,7 @@
 
             <el-form-item>
                 <el-button-group>
-                    <el-button type="primary" icon="search" @click="getCodeList"
+                    <el-button type="primary" icon="search" @click="search"
                     >查询
                     </el-button
                     >
@@ -255,7 +255,10 @@
                 this.query.page = val;
                 this.getCodeList();
             },
-
+            search() {
+                this.query.page = 1;
+                this.getCodeList();
+            },
             getCodeList() {
                 this.loading = true;
                 this.query.corpOrderId = this.idQuery.id;

src/views/warehouse/errorCode.vue

@@ -103,6 +103,8 @@
             :visible.sync="dialogTableVisible"
             v-if="dialogTableVisible"
             width="70%"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
             append-to-body
         >
             <DialogSelectUnit
@@ -116,6 +118,8 @@
             :visible.sync="selectRlVisible"
             width="80%"
             v-if="selectRlVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
             append-to-body
         >
             <selectRlDialog
@@ -131,6 +135,8 @@
             :visible.sync="editCodeVisible"
             append-to-body width="70%"
             v-if="editCodeVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <editCodeDialog
                 editTye="2"

src/views/warehouse/stockOrderDelete.vue

@@ -115,6 +115,7 @@
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
                 :total="total"
+                :current-page="query.page"
             >
             </el-pagination>
         </el-card>
@@ -186,6 +187,8 @@
             :visible.sync="codeDetailVisible"
             width="80%"
             v-if="codeDetailVisible"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
         >
             <codeReplace
                 :idQuery="idQuery"
@@ -331,6 +334,7 @@
                 this.actDateRange = [];
             },
             onSubmit() {
+                this.query.page = 1;
                 this.getList();
             },
             handleCurrentChange(val) {

src/views/warehouse/stockOrderEdit.vue

@@ -146,6 +146,7 @@ export default {
                 page: 1,
                 limit: 20
             },
+            detailTotal: 0,
             batchForm: {
                 secSalesListNo: '',
                 firstSalesInvNo: '',
@@ -162,7 +163,6 @@ export default {
     methods: {
         handleEdit(index, row) {
             this.currentCheckIndex = index;
-            console.log(this.currentCheckIndex)
         },
         handleSave(index, row) {
             this.currentCheckIndex = -1;
@@ -179,7 +179,6 @@ export default {
             row.forEach((item) => {
                 _this.multipId.push(item.id);
             })
-            console.log(this.multipId);
         },
         batchSetParams(flag, type) {
             if (flag == '1' && type == 'salesListNo') {
@@ -266,9 +265,9 @@ export default {
             this.detailLoading = true;
             stockOrderDetail(this.detailQuery)
                 .then((response) => {
-                    console.log(response)
                     this.detailLoading = false;
                     this.detailList = response.data.list || [];
+                    this.detailTotal = response.data.total;
                 })
                 .catch(() => {
                     this.detailLoading = false;

src/views/warehouse/stockOrderSearch.vue

@@ -140,6 +140,7 @@
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
                 :total="total"
+                :current-page="query.page"
             >
             </el-pagination>
         </el-card>
@@ -597,6 +598,15 @@ export default {
             this.haveDistributionVisible = true;
             this.actDateRange = [];
         },
+        resetDetailQuery() {
+            this.detailQuery = {
+                orderIdFk: "",
+                page: 1,
+                limit: 20
+            }
+            this.detailList = [];
+            this.detailTotal = 0;
+        },
         onSubmit() {
             if (this.actDateRange !== null) {
                 this.query.startTime = this.actDateRange[0];
@@ -605,6 +615,7 @@ export default {
                 this.query.startTime = null;
                 this.query.endTime = null;
             }
+            this.query.page = 1;
             this.getList();
             if (this.query.status === "202" || this.query.status === "502") {
                 this.haveDistributionVisible = true;
@@ -709,6 +720,7 @@ export default {
             }
         },
         getList() {
+            this.resetDetailQuery();
             this.loading = true;
             this.query.corpId = store.getters.customerId;
             stockOrderList(this.query)