Merge branch 'fencang' into busUser

src/views/basic/UdiInfoManage.vue

@@ -58,16 +58,16 @@
                         <el-button-group>
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                             <el-button type="primary" icon="search" @click="submit">查询</el-button>
-                            <el-button type="primary" icon="search" @click="intentDetail"
+                            <el-button type="primary" icon="search" @click="intentDetail" :disabled="!configParms.basicProducts"
                             >关联添加
                             </el-button>
 
-                            <el-button type="primary" icon="search" @click="intentImportUdi"
+                            <el-button type="primary" icon="search" @click="intentImportUdi" :disabled="!configParms.basicProducts"
                             >添加DI信息
                             </el-button
                             >
 
-                            <el-button type="primary" icon="search" @click="intentImportErp"
+                            <el-button type="primary" icon="search" @click="intentImportErp" :disabled="!configParms.basicProducts"
                             >添加产品信息
                             </el-button
                             >
@@ -150,7 +150,7 @@
                         <el-button
                             type="text"
                             size="small"
-                            :disabled="scope.row.originUuid != null"
+                            :disabled="scope.row.originUuid != null || !configParms.basicProducts"
                             @click.native.stop="intentSelectUdi(scope.row)"
                         >关联DI
                         </el-button>
@@ -164,10 +164,10 @@
                         <el-button
                             type="text"
                             size="small"
-                            @click.native.stop="handleModifyClick(scope.row)"
+                            @click.native.stop="handleModifyClick(scope.row)" :disabled="!configParms.basicProducts"
                         >编辑
                         </el-button>
-                        <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
+                        <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" :disabled="!configParms.basicProducts"
                         >删除
                         </el-button>
                     </template>
@@ -846,6 +846,7 @@ import selectUdi from "./UdiInfoRelevance.vue";
 import selectErp from "./UdiInfoselectErpUdi";
 import selectLocalUdi from "./UdiInfoSelectLocalUdi";
 import selectUdiVersion from "./UdiinfoSelectVersion";
+import {findConfig} from "@/api/thrsys/spsSyncStatus";
 
 export default {
     data() {
@@ -908,6 +909,7 @@ export default {
             selectLocalVisible: false,      //关联UDI
             isUseDyCheck: false,
             lockStatusMap: {1: "未提交", 2: "已提交", 3: "已锁定"},
+            configParms: {},
         };
     },
 
@@ -1325,6 +1327,16 @@ export default {
                     this.cancelDialog();
                 });
         },
+        getSyncConfig() {
+            findConfig()
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.configParms = response.data;
+                    }
+                })
+                .catch(() => {
+                });
+        },
 
         selectSysParam() {
             let query = {
@@ -1383,6 +1395,7 @@ export default {
         this.getList();
         this.selectSysParam();
         this.getSysFilter();
+        this.getSyncConfig();
     },
 };
 </script>

src/views/basic/UdiInfoManageSp.vue

@@ -372,6 +372,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
+                                    :disabled="true"
                                     size="small"
                                     splaceholder="请输入内容"
                                     v-model="editQuery.sptm"
@@ -385,6 +386,7 @@
                                 </div>
                                 <el-input
                                     style="width: 65%"
+                                    :disabled="true"
                                     size="small"
                                     splaceholder="请输入内容"
                                     v-model="editQuery.ybbm"
@@ -671,13 +673,13 @@
                                 <el-checkbox v-model="editQuery.isAdavence" disabled
                                 >是否寄售
                                 </el-checkbox>
-                                <el-checkbox v-model="editQuery.allowNoBatch" class=""
+                                <el-checkbox v-model="editQuery.allowNoBatch" class="" disabled
                                 >允许无批次号
                                 </el-checkbox>
-                                <el-checkbox v-model="editQuery.allowNoExpire" class=""
+                                <el-checkbox v-model="editQuery.allowNoExpire" class="" disabled
                                 >允许无失效日期
                                 </el-checkbox>
-                                <el-checkbox v-model="editQuery.allowNoProduct" class=""
+                                <el-checkbox v-model="editQuery.allowNoProduct" class="" disabled
                                 >允许无生产日期
                                 </el-checkbox>
                             </div>

src/views/thrsys/SysUdimsConfig.vue

@@ -367,7 +367,7 @@ export default {
                 .then((response) => {
                     this.busTypes = response.data.list || [];
                     this.total = response.data.total || 0;
-                    this.getConfig();
+                    // this.getConfig();
                 })
                 .catch(() => {
                 });
@@ -411,7 +411,7 @@ export default {
             ADMIN_ID: store.getters.adminId,
             ADMIN_TOKEN: store.getters.token,
         };
-
+        this.getConfig();
         this.getBusType();
     },
 }

src/views/thrsys/SysUdimsData.vue

@@ -370,12 +370,10 @@ export default {
         }
         ,
         handleChange(response, files, fileList) {
-            console.log(response);
             if (response.code != 20000) {
                 this.$message.error(response.message);
                 this.getList();
             } else {
-                // console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
                 this.$message.success(response.data);
                 this.getList();
             }

src/views/thrsys/ThrInvWarehouse.vue

@@ -134,6 +134,7 @@
                         <el-button
                             type="text"
                             size="small"
+                            :disabled="!configParms.basicThirdInv"
                             @click.native.stop="handleSubForm( scope.row, 'edit')"
                         >编辑
                         </el-button
@@ -141,7 +142,7 @@
                         <el-button
                             type="text"
                             size="small"
-                            :disabled="!configParms.basicInv"
+                            :disabled="!configParms.basicThirdInv"
                             @click.native.stop="handleSubDel(scope.row)"
                         >删除
                         </el-button

src/views/warehouse/DialogcChangeNewOrder.vue

@@ -298,6 +298,12 @@ export default {
                 this.$message.error("产品列表不能为空");
                 return;
             }
+
+            if (this.formData.locStorageCode === this.formData.fromCorp || this.formData.invWarehouseCode === this.formData.fromSubInvCode) {
+                this.$message.error("当前仓库和往来仓库不能相同！");
+                return;
+            }
+
             let products = [];
             this.detailList.forEach(item => {
                 let product = {

src/views/warehouse/IOCheckErrOrder.vue

@@ -426,6 +426,7 @@
                 v-on:closeManuDialog="closeManuDialog"
                 :orderId="orderId"
                 :orderAction="billAction"
+                :curLocInv="curLocInv"
             ></selectErpOrder>
         </el-dialog>
 
@@ -597,6 +598,7 @@ export default {
             index: null,
             formName: null,
             orderId: "",
+            curLocInv: null,
             formMap: {
                 add: "新增",
                 edit: "编辑",
@@ -711,7 +713,6 @@ export default {
             this.getList();
         },
         handleSelectionChange(val) {
-            console.log(val);
             this.multipleSelection = val;
         },
 
@@ -777,7 +778,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.total = response.data.total || 0;
@@ -885,7 +885,6 @@ export default {
         refresgOrderDetail() {
             orderDetail(this.detailQuery)
                 .then((response) => {
-                    console.log(response)
                     this.loading = false;
                     this.detailList = response.data || [];
                 })
@@ -928,7 +927,6 @@ export default {
             this.successOrderExportPDFSettingVisible = true;
         },
         successOrderExportPDF(row) {
-            console.log(row)
             let tQuery = {
                 orderId: row.id,
                 customerId: store.getters.customerId
@@ -1187,7 +1185,6 @@ export default {
         },
 
         uploadOrderDialog(value) {
-            console.log(value.id + "---" + value.orderid);
             this.uploadQuery = {
                 orderId: value.id,
             };
@@ -1238,6 +1235,7 @@ export default {
         importOrder(row) {
             this.orderId = row.id;
             this.billAction = row.action;
+            this.curLocInv = row.locStorageCode;
             this.addDialogVisible = true;
         },
         invChange() {

src/views/warehouse/addHosOrder.vue

@@ -345,6 +345,12 @@
                     show-overflow-tooltip
                 ></el-table-column>
 
+                <el-table-column
+                    label="实际数量"
+                    prop="reCount"
+                    show-overflow-tooltip
+                ></el-table-column>
+
                 <el-table-column label="操作" fixed="right" width="250">
                     <template slot-scope="scope">
                         <el-button

src/views/warehouse/addOrder.vue

@@ -201,6 +201,11 @@
                         width="80"
                         show-overflow-tooltip
                     ></el-table-column>
+                    <el-table-column
+                        label="实际数量"
+                        prop="reCount"
+                        show-overflow-tooltip
+                    ></el-table-column>
                     <el-table-column
                         label="生产日期"
                         prop="produceDate"

src/views/warehouse/editCode.vue

@@ -83,6 +83,17 @@
                                   :disabled="editData.serialNo!=null && editData.serialNo!='' "></el-input>
                     </el-form-item>
                 </el-col>
+
+                <el-col :span="3">
+                    <div class="ao-text">
+                        <span>是否以使用单元数量入库：</span>
+                    </div>
+                </el-col>
+                <el-col :span="7">
+                    <el-form-item>
+                        <el-checkbox v-model="isUseDyCheck" disabled></el-checkbox>
+                    </el-form-item>
+                </el-col>
             </el-row>
             <el-row :gutter="20">
                 <el-col :span="17">
@@ -130,6 +141,7 @@ export default {
     data() {
         return {
             xlhEnable: false,
+            isUseDyCheck: false
         };
     },
 
@@ -167,6 +179,9 @@ export default {
                         if (response.data.scbssfbhxlh == "否") {
                             this.xlhEnable = true;
                         }
+                        if (response.data.zxxsbzbhsydysl > 1) {
+                            this.isUseDyCheck = true;
+                        }
                     } else {
                     }
                     this.loading = false;

src/views/warehouse/stockHospOrderNew.vue

@@ -62,7 +62,7 @@
                     </el-col>
                 </el-row>
 
-                <el-row :gutter="20" style="margin-top: -10px">
+                <el-row :gutter="20" style="margin-top: -5px">
                     <el-col :span="3">
                         <div class="ao-text">
                             <span>业务类型：</span>
@@ -163,7 +163,7 @@
                     </el-col>
 
                 </el-row>
-                <el-row :gutter="20" style="margin-top: -10px">
+                <el-row :gutter="20" style="margin-top: 5px">
                     <el-col :span="3">
                         <div class="ao-text">
                             <span>当前仓库：</span>
@@ -1269,7 +1269,6 @@ export default {
         actionChange(item) {
             this.curAction = this.getActionItem(item);
             this.formData.corpName = '';
-
             if (this.$isNotBlank(this.formData.fromSubInvCode)) {
                 this.formData.fromSubInvCode = '';
             }
@@ -1288,8 +1287,8 @@ export default {
             this.getBusType();
         },
         invChange() {
-            if (this.$isNotBlank(this.formData.invWarehouseCode))
+            /*if (this.$isNotBlank(this.formData.invWarehouseCode))
-                this.formData.invWarehouseCode = null;
+                this.formData.invWarehouseCode = null;*/
             this.findSubInvs();
         },
 

src/views/warehouse/stockOrder.vue

@@ -497,6 +497,8 @@ export default {
 
             this.haveDistributionVisible = true;
             this.actDateRange = [];
+
+            this.resetDetailQuery();
         },
         onSubmit() {
             if (this.actDateRange !== null) {
@@ -506,16 +508,26 @@ export default {
                 this.query.startTime = null;
                 this.query.endTime = null;
             }
-
+            this.query.page = 1;
             this.getList();
             this.haveDistributionVisible = true;
+
+            this.resetDetailQuery();
+        },
+        resetDetailQuery() {
+            this.detailQuery = {
+                orderIdFk: "",
+                page: 1,
+                limit: 20
+            };
+            this.detailTotal = 0;
         },
         handleCurrentChange(val) {
             this.query.page = val;
             this.getList();
         },
         detailHandleCurrentChange(val) {
-            this.query.page = val;
+            this.detailQuery.page = val;
             this.getStockOrderDetailList();
         },
         // 刷新表单
@@ -621,9 +633,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/stockOrderDelSearch.vue

@@ -161,6 +161,7 @@
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
                 :total="total"
+                :current-page="query.page"
             >
             </el-pagination>
         </el-card>
@@ -239,6 +240,7 @@
                 @current-change="detailHandleCurrentChange"
                 layout="prev, pager, next"
                 :total="detailTotal"
+                :current-page="detailQuery.page"
             >
             </el-pagination>
         </el-card>
@@ -575,7 +577,7 @@ export default {
             }
         },
         detailHandleCurrentChange(val) {
-            this.query.page = val;
+            this.detailQuery.page = val;
             this.getStockOrderDetailList();
         },
         // 刷新表单

src/views/warehouse/stockOrderEditor.vue

@@ -80,11 +80,8 @@
             <el-table v-loading="loading"
                       :data="list"
                       style="width: 100%; "
+                      highlight-current-row
                       @row-click="getStockOrderDetailList" ref="multipleTable">
-                <el-table-column
-                    type="selection"
-                    width="55">
-                </el-table-column>
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
                 <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
                 <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
@@ -129,8 +126,6 @@
                         >单据打印
                         </el-button
                         >
-
-
                     </template>
                 </el-table-column>
             </el-table>
@@ -139,6 +134,7 @@
                 @current-change="handleCurrentChange"
                 layout="prev, pager, next"
                 :total="total"
+                :current-page="query.page"
             >
             </el-pagination>
         </el-card>
@@ -146,6 +142,7 @@
         <el-card class="el-card">
             <el-table v-loading="detailLoading"
                       :data="detailList"
+                      highlight-current-row
                       style="width: 100%">
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
                 <el-table-column label="产品通用名" width="150" prop="productName"></el-table-column>
@@ -190,6 +187,7 @@
                 @current-change="detailHandleCurrentChange"
                 layout="prev, pager, next"
                 :total="detailTotal"
+                :current-page="detailTotal.page"
             >
             </el-pagination>
         </el-card>
@@ -628,6 +626,8 @@ export default {
             this.detailList = [];
             this.haveDistributionVisible = false;
             this.actDateRange = [];
+
+            this.resetDetailQuery();
         },
         onSubmit() {
             if (this.actDateRange !== null) {
@@ -638,19 +638,30 @@ export default {
                 this.query.endTime = null;
             }
 
+            this.query.page = 1;
             this.getList();
             if (this.query.status === "202") {
                 this.haveDistributionVisible = true;
             } else {
                 this.haveDistributionVisible = false;
             }
+
+            this.resetDetailQuery();
+        },
+        resetDetailQuery() {
+            this.detailQuery = {
+                orderIdFk: "",
+                page: 1,
+                limit: 20
+            };
+            this.detailTotal = 0;
         },
         handleCurrentChange(val) {
             this.query.page = val;
             this.getList();
         },
         detailHandleCurrentChange(val) {
-            this.query.page = val;
+            this.detailQuery.page = val;
             this.getStockOrderDetailList();
         },
         // 刷新表单
@@ -755,6 +766,7 @@ export default {
                 .then((response) => {
                     this.detailLoading = false;
                     this.detailList = response.data.list || [];
+                    this.detailTotal = response.data.total;
                 })
                 .catch(() => {
                     this.detailLoading = false;

src/views/warehouse/stockOrderNew.vue

@@ -591,6 +591,17 @@ export default {
 
             this.haveNewDistributionVisible = false;
             this.actDateRange = [];
+
+            //重置产品列表查询参数
+            this.resetDetailQuery();
+        },
+        resetDetailQuery() {
+            this.detailTotal = {
+                orderIdFk: "",
+                page: 1,
+                limit: 20
+            };
+            this.detailTotal = 0;
         },
         onSubmit() {
             if (this.actDateRange !== null) {
@@ -607,13 +618,14 @@ export default {
             } else {
                 this.haveNewDistributionVisible = false;
             }
+            this.resetDetailQuery();
         },
         handleCurrentChange(val) {
             this.query.page = val;
             this.getList();
         },
         detailHandleCurrentChange(val) {
-            this.query.page = val;
+            this.detailQuery.page = val;
             this.getStockOrderDetailList();
         },
         // 刷新表单

src/views/warehouse/stockOrderNewDistribution.vue

@@ -63,7 +63,7 @@
                     </el-col>
                 </el-row>
 
-                <el-row :gutter="20" style="margin-top: -10px">
+                <el-row :gutter="20" style="margin-top: -5px">
 
                     <el-col :span="3">
                         <div class="ao-text">
@@ -98,7 +98,7 @@
 
                 </el-row>
 
-                <el-row :gutter="20" style="margin-top: -10px">
+                <el-row :gutter="20" style="margin-top: 5px">
 
                     <el-col :span="3">
                         <div class="ao-text">

src/views/warehouse/stockOrderWaitCheck.vue

@@ -81,10 +81,6 @@
                       :data="list" highlight-current-row
                       style="width: 100%;"
                       @row-click="getStockOrderDetailList" ref="multipleTable">
-                <el-table-column
-                    type="selection"
-                    width="55">
-                </el-table-column>
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
                 <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
                 <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
@@ -477,6 +473,7 @@ export default {
                 this.query.endTime = null;
             }
 
+            this.query.page = 1;
             this.getList();
             if (this.query.status === "202" || this.query.status === "502") {
                 this.haveDistributionVisible = true;
@@ -506,7 +503,7 @@ export default {
             this.getList();
         },
         detailHandleCurrentChange(val) {
-            this.query.page = val;
+            this.detailQuery.page = val;
             this.getStockOrderDetailList();
         },
         // 刷新表单
@@ -610,9 +607,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;