自助平台bug修复同步（二级bug修复）

src/role.js

@@ -104,7 +104,7 @@ router.beforeEach((to, from, next) => {
                 })
                 .catch(() => {
                     store.dispatch("fedLogout").then(() => {
-                        Message.error("验证失败,请重新登录");
+                        Message.error("登录失效,请重新登录");
                         let redirect = to.fullPath;
                         store.dispatch("loginOut").then(() => {
                             next({

src/utils/axios.js

@@ -42,7 +42,7 @@ service.interceptors.response.use(
         if (data.code) {
             if (data.code === 2) {
                 store.dispatch("fedLogout").then(() => {
-                    Message.error("验证失败,请重新登录");
+                    Message.error("登录失效,请重新登录");
                     router.push({
                         path: "/login",
                         query: { redirect: router.currentRoute.fullPath } // 从哪个页面跳转过来

src/utils/axios2.js

@@ -21,7 +21,7 @@ service.interceptors.response.use(
         if (data.code) {
             if (data.code === 2) {
                 store.dispatch("fedLogout").then(() => {
-                    Message.error("验证失败,请重新登录");
+                    Message.error("登录失效,请重新登录");
                     router.push({
                         path: "/login",
                         query: {redirect: router.currentRoute.fullPath} // 从哪个页面跳转过来

src/views/basic/UdiRlDetailDialog.vue

@@ -393,7 +393,7 @@ export default {
     methods: {
         getThirdSysDetail() {
             let query = {
-                id: this.editQuery.id,
+              id: this.editQuery.rlId,
             };
 
             thirdSysDetail(query)

src/views/business/stockOrderEditDistribution.vue

@@ -135,6 +135,22 @@
                     </el-col>
 
                 </el-row>
+
+                <el-row :gutter="20" style="margin-top: -10px;">
+                    <el-col :span="3">
+                        <div class="ao-text">
+                            <span></span>
+                        </div>
+                    </el-col>
+                    <el-col :span="7">
+                        <el-form-item prop="type" style="margin-right: 20px;"
+                                      v-if="!(curAction.mainAction=='WareHouseIn' && curAction.corpType == 0)">
+                            <el-checkbox v-model="formData.noInvOut">允许无库存出库
+                            </el-checkbox>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
             </el-card>
 
             <el-card>
@@ -380,7 +396,21 @@ export default {
                 page: 1,
                 limit: 10,
             },
-            formData: {},
+            formData: {
+
+                noInvOut: false,
+                locStorageCode: null,
+                invWarehouseCode: null,
+                fromSubInvCode: null,
+                billNo: null,
+                billdate: "",
+                customerId: store.getters.customerId,
+                billType: "",
+                type: null,
+                corpName: "",
+                corpId: "",
+
+            },
             formRules: {
                 corpName: [
                     {required: true, message: "请输入供应商", trigger: "blur"}
@@ -1061,13 +1091,16 @@ export default {
             this.invChange();
         } else {
             this.formData = {
+                billNo: null,
                 billdate: "",
-                corpName: store.getters.companyName,
                 customerId: store.getters.customerId,
-                // billType: "deliveryNote",
                 billType: "",
-                type: "1",
+                type: "2",
-                // type: "",
+                corpName: "",
+                corpId: "",
+                noInvOut: "",
+                locStorageCode: store.getters.locInvCode,
+                invWarehouseCode: store.getters.locSubInvCode,
             };
             this.iCount = 0;
             this.orderEditor = false;

src/views/inout/DialogSelectErpOrder.vue

@@ -115,25 +115,30 @@
             >
                 <el-table-column label="序号" type="index"></el-table-column>
 
-                <el-table-column
-                    label="产品ID"
-                    prop="productId"
-                    :show-overflow-tooltip="true"
-                ></el-table-column>
 
                 <el-table-column
                     label="产品名称"
                     prop="productName"
                     :show-overflow-tooltip="true"
                 ></el-table-column>
+                <el-table-column
+                    label="规格型号"
+                    prop="spec"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
                 <el-table-column
                     label="批号"
                     prop="batchNo"
                     :show-overflow-tooltip="true"
                 ></el-table-column>
                 <el-table-column
-                    label="规格型号"
+                    label="生产日期"
-                    prop="spec"
+                    prop="productDate"
+                    :show-overflow-tooltip="true"
+                ></el-table-column>
+                <el-table-column
+                    label="失效日期"
+                    prop="expireDate"
                     :show-overflow-tooltip="true"
                 ></el-table-column>
                 <el-table-column label="单据数量" prop="count"></el-table-column>

src/views/inout/DialogSelectUnit.vue

@@ -90,15 +90,15 @@ export default {
     },
     methods: {
         getUnitList() {
-            this.loading = true;
+            // this.loading = true;
-            getBasicUnitMaintains(this.unitquery)
+            // getBasicUnitMaintains(this.unitquery)
-                .then((response) => {
+            //     .then((response) => {
-                    this.loading = false;
+            //         this.loading = false;
-                    this.unitlist = response.data.page.list || [];
+            //         this.unitlist = response.data.page.list || [];
-                })
+            //     })
-                .catch(() => {
+            //     .catch(() => {
-                    this.loading = false;
+            //         this.loading = false;
-                });
+            //     });
         },
         getUnitListByCode(row) {
             let query = {

src/views/inout/IOAddOrder.vue

@@ -589,9 +589,9 @@ export default {
         },
         closeCodeDialog() {
             //编辑完，获取编辑之后的条码
-            this.getCodeList();
             this.editCodeVisible = false;
             this.editOriginCodeVisible = false;
+            this.getCodeList();
         },
         editCode(row) {
             this.codeDetail = row;

src/views/inout/errorCode.vue

@@ -355,6 +355,7 @@ export default {
         },
         closeCodeDialog() {
             this.editCodeVisible = false;
+            this.getCodeList();
         },
         editCode(row) {
             this.codeDetail = row;