Merge branch 'sit'

src/config/env.development.js

@@ -8,9 +8,7 @@ module.exports = {
     // baseApi: 'http://www.stock.com/',
 
     userApi: 'http://inv.test241.wanyuhengtong.com/',
-    baseApi: 'http://process.test241.wanyuhengtong.com/',
-    // userApi: 'http://inv.sitw.wanyuhengtong.com/',
-    // baseApi: 'http://stock.api.wanyuhengtong.com/',
+    baseApi: 'http://stock.test241.wanyuhengtong.com/',
   },
   webUrl:'http://share.sitw.wanyuhengtong.com/#/test-good-share?id=',
   fileURL: `https://api2.edusit.zretchome.com`,

src/store/modules/user.js

@@ -252,10 +252,13 @@ async function getRoleProcess(roleid) {
   let list = data;
   list.map((si) => {
     si.action = [];
-    si.child.map((sii) => {
-      si.action.push(sii.order_process + "");
-      return sii;
-    });
+    if (si.child && si.child.length > 0) {
+      si.child.map((sii) => {
+        si.action.push(sii.order_process + "");
+        return sii;
+      });
+    }
+
     return si;
   });
   return {

src/views/process/done/index.vue

@@ -2,7 +2,7 @@
   <div class="done pagePadding">
     <ex-table
       v-loading="loading"
-      v-if=" powers.some((i) => i == '001')"
+      v-if="powers.some((i) => i == '001')"
       :table="table"
       :data="tableData"
       :columns="columns"
@@ -21,10 +21,8 @@
     >
       <template #table-header="{}">
         <div style="width: 100%; height: 30px">
-          <el-row  style="padding-left: 80px">
- 
-              <el-col :span="7" style="width:350px">
-              
+          <el-row style="padding-left: 80px">
+            <el-col :span="7" style="width: 350px">
               <period-date-picker
                 :type="1"
                 :width="'155px'"
@@ -34,7 +32,7 @@
                 @timeReturned="handleTime"
               />
             </el-col>
-            <el-col :span="5" style="width:205px; float:left;">
+            <el-col :span="5" style="width: 205px; float: left">
               <el-select
                 v-model="parmValue.xiugai2"
                 :size="'mini'"
@@ -48,36 +46,36 @@
               >
                 <el-option
                   v-for="item in routerList"
-                  :key="'status' + item.value"
+                  :key="'status' + item.type"
                   :label="item.name"
-                  :value="item.value"
+                  :value="item.type"
                 />
               </el-select>
             </el-col>
-              <el-col :span="3" style="width: 66px; float: right">
-                <el-button
-                  type="primary"
-                  :size="searchSize"
-                  style="float: right"
-                  @click="searchList"
-                >
-                  刷新
-                </el-button>
-              </el-col>
-              <el-col
-                :span="3"
-                style="width: 66px; float: right"
-                v-if="powers.some((i) => i == '003')"
+            <el-col :span="3" style="width: 66px; float: right">
+              <el-button
+                type="primary"
+                :size="searchSize"
+                style="float: right"
+                @click="searchList"
               >
-                <el-button
-                  :size="searchSize"
-                  type="success"
-                  style="float: right"
-                  @click="openModal('add', false)"
-                >
-                  添加
-                </el-button>
-              </el-col>
+                刷新
+              </el-button>
+            </el-col>
+            <el-col
+              :span="3"
+              style="width: 66px; float: right"
+              v-if="powers.some((i) => i == '003')"
+            >
+              <el-button
+                :size="searchSize"
+                type="success"
+                style="float: right"
+                @click="openModal('add', false)"
+              >
+                添加
+              </el-button>
+            </el-col>
           </el-row>
         </div>
       </template>
@@ -86,8 +84,8 @@
           :size="tablebtnSize"
           :type="scope.row.status == '0' ? 'warning' : ''"
           v-text="
-            (statusOptions.find((item) => item.id == scope.row.status) || {})
-              .label || '--'
+            (statusOptions.find((item) => item.id == scope.row.status) || {}).label ||
+            '--'
           "
         ></el-tag>
       </template>
@@ -122,9 +120,7 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      const tran =
-        this.$store.getters.btnList.find((i) => i.menu_route == "done") ||
-        {};
+      const tran = this.$store.getters.btnList.find((i) => i.menu_route == "done") || {};
       const { action } = tran ?? {};
       return action ?? [];
     },
@@ -137,8 +133,8 @@ export default {
       parmValue: {
         xiugai1: "",
         xiugai2: "",
-        start:"",
-        end:"",
+        start: "",
+        end: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -157,19 +153,19 @@ export default {
         total: 0,
       },
       // 表格 - 列参数
-      columns: columns 
+      columns: columns,
     };
   },
   mounted() {
     const { back } = this.$route.query;
     if (back) {
       this.parmValue = JSON.parse(back);
-      const {page,size}=this.parmValue
-       this.pageInfo= {
+      const { page, size } = this.parmValue;
+      this.pageInfo = {
         size: size,
         curr: page,
         total: 0,
-      }
+      };
     }
     this.searchList();
   },
@@ -181,12 +177,12 @@ export default {
           id: queryId,
         };
 
-         let routerModel = {
+        let routerModel = {
           options: JSON.parse(JSON.stringify(this.parmValue)),
           router: this.$route.path,
         };
         model.preModel = JSON.stringify(routerModel);
-        
+
         this.routeGoto(toRouter, model);
       } else {
         this.$message.warning("暂未找到相关流程！");
@@ -214,8 +210,8 @@ export default {
       this.parmValue = {
         xiugai1: "",
         xiugai2: "",
-        start:"",
-        end:"",
+        start: "",
+        end: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
       };
@@ -229,15 +225,12 @@ export default {
       if (res && res.code === 0 && res.data) {
         this.tableData = res.data.list;
         this.tableData.forEach((v, i) => {
-          let index = this.process_router_list.findIndex(
-            (y) => y.type === v.order_type
-          );
+          let index = this.process_router_list.findIndex((y) => y.type === v.order_type);
           if (index !== -1) {
             const { name, toRouter, to } = this.process_router_list[index];
             this.tableData[i].process_name = name;
             this.tableData[i].toRouter = toRouter;
-            this.tableData[i].queryId =
-              to == "code" ? v.order_code : v.order_id;
+            this.tableData[i].queryId = to == "code" ? v.order_code : v.order_id;
           } else {
             this.tableData[i].process_name = "";
             this.tableData[i].toRouter = "";
@@ -257,5 +250,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

src/views/process/oing/index.vue

@@ -2,7 +2,7 @@
   <div class="oing pagePadding">
     <ex-table
       v-loading="loading"
-      v-if=" powers.some((i) => i == '001')"
+      v-if="powers.some((i) => i == '001')"
       :table="table"
       :data="tableData"
       :columns="columns"
@@ -24,8 +24,7 @@
       <template #table-header="{}">
         <div style="width: 100%; height: 30px">
           <el-row :gutter="10" style="padding-left: 80px">
-            <el-col :span="7" style="width:350px">
-              
+            <el-col :span="7" style="width: 350px">
               <period-date-picker
                 :type="1"
                 :width="'155px'"
@@ -35,7 +34,7 @@
                 @timeReturned="handleTime"
               />
             </el-col>
-            <el-col :span="5" style="width:205px; float:left;">
+            <el-col :span="5" style="width: 205px; float: left">
               <el-select
                 v-model="parmValue.xiugai2"
                 :size="'mini'"
@@ -49,9 +48,9 @@
               >
                 <el-option
                   v-for="item in routerList"
-                  :key="'status' + item.value"
+                  :key="'status' + item.type"
                   :label="item.name"
-                  :value="item.value"
+                  :value="item.type"
                 />
               </el-select>
             </el-col>
@@ -120,9 +119,7 @@ export default {
     //组件SIZE设置
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      const tran =
-        this.$store.getters.btnList.find((i) => i.menu_route == "oing") ||
-        {};
+      const tran = this.$store.getters.btnList.find((i) => i.menu_route == "oing") || {};
       const { action } = tran ?? {};
       return action ?? [];
     },
@@ -136,8 +133,8 @@ export default {
       parmValue: {
         xiugai1: "",
         xiugai2: "",
-        start:"",
-        end:"",
+        start: "",
+        end: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
@@ -173,14 +170,12 @@ export default {
     }
     this.searchList();
 
-    this.searchProList();
+    // this.searchProList();
   },
   methods: {
     getRouter(row) {
       const { order_type, order_id, order_code } = row;
-      let index = this.process_router_list.findIndex(
-        (y) => y.type === order_type
-      );
+      let index = this.process_router_list.findIndex((y) => y.type === order_type);
       if (index !== -1) {
         const { toRouter, to } = this.process_router_list[index];
         let model = {
@@ -222,12 +217,12 @@ export default {
       this.parmValue = {
         xiugai1: "",
         xiugai2: "",
-        start:"",
-        end:"",
+        start: "",
+        end: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
-      },
-      this.searchProList();
+      };
+      // this.searchProList();
       this.searchList();
     },
 
@@ -284,5 +279,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

src/views/sellOut/project/components/backGoodShow.vue

@@ -50,7 +50,7 @@
         <el-tooltip
           effect="dark"
           class="fr"
-          v-if="ppowers.some((i) => i == '0') && (status === '1' || status === '2')"
+          v-if="ppowers.some((i) => i == '1') && (status === '1' || status === '2')"
           content="添加线上商品"
           style="margin: 16px 10px 0 0"
           placement="top"

src/views/sellOut/sellOutOrder/components/want-deliver.vue

@@ -132,12 +132,12 @@ export default {
         if (value === "") {
           callback(new Error("物流单号不能为空!"));
         } else if (l < 9 || l > 20) {
-          callback(new Error("仅支持0;纯数字或字母数字组合(9~20位)!"));
+          callback(new Error("仅支持纯数字或字母数字组合(9~20位)!"));
         } else if (isnumber(value)) {
           callback();
         } else if (!isAlphanumeric(value)) {
           console.log(!isAlphanumeric(value));
-          callback(new Error("仅支持0;纯数字或字母数字组合(9~20位)!"));
+          callback(new Error("仅支持纯数字或字母数字组合(9~20位)!"));
         } else {
           callback();
         }