Merge branch 'live' into edit

scripts/page/indexPage.js

@@ -314,6 +314,12 @@ module.exports = function (inputName, compoenntName) {
           page: 1, // 页码
           size: 10, // 每页显示条数
         };
+        // 表格 - 分页
+        this.pageInfo = {
+          size: 15,
+          curr: 1,
+          total: 0,
+        };
         this.searchList();
       },
       

src/apis/service/stock/check/detail.js

@@ -13,6 +13,6 @@ export default {
   // 更新
   update: (data, params) => http(api + "checkedit", data, "post", params),
   // 修改状态
-  status: (data, params) => http(api + "accountstatus", data, "post", params),
+  status: (data, params) => http(api + "checkestatus", data, "post", params),
 };
    

src/components/search-good-modal/main.vue

@@ -231,6 +231,12 @@ export default {
         wsmcode: "", //仓库code
         page: 1, // 页码
         size: 15, // 每页显示条数
+      };
+       // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
       };
       this.searchList();
     },

src/views/interest/account/index.vue

@@ -341,6 +341,12 @@ export default {
         status: "", //
         page: 1, // 页码
         size: 15, // 每页显示条数
+      };
+       // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
       };
       this.searchList();
     },

src/views/interest/group/index.vue

@@ -237,7 +237,7 @@ export default {
     restSearch() {
       // 表格 - 分页
       this.pageInfo = {
-        size: 10,
+        size: 15,
         curr: 1,
         total: 0,
       };

src/views/interest/handover/components/addEditForm.vue

@@ -176,9 +176,9 @@ export default {
       this.showModelThis = false;
     },
     async initForm() {
-      this.status = "";
       this.loading = true;
       if (this.id === "add") {
+        this.status = "";
         this.rulesThis = this.rules;
         this.disabled = false;
         await this.resetForm();
@@ -192,8 +192,7 @@ export default {
     async initData() {
       const res = await asyncRequest.detail({ id: this.id });
       if (res && res.code === 0 && res.data) {
-        let { hand_name, resign_name, hand_uid, resign_uid, id, status } =
-          res.data;
+        let { hand_name, resign_name, hand_uid, resign_uid, status } = res.data;
         this.resign_name = resign_name;
         this.hand_name = hand_name;
         this.status = status;
@@ -259,6 +258,8 @@ export default {
             if (this.id === "add") {
               this.showModelThis = false;
               this.$emit("refresh", false);
+            } else {
+              this.initForm();
             }
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
@@ -298,9 +299,6 @@ export default {
         });
 
         this.routeGoto("handover", {});
-        // window.vm.$router.push({
-        //   path: "handover",
-        // });
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {

src/views/interest/handover/index.vue

@@ -286,6 +286,12 @@ export default {
         hand_uid: "",
         page: 1, // 页码
         size: 15, // 每页显示条数
+      };
+       // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
       };
       this.searchList();
     },

src/views/process/done/index.vue

@@ -241,7 +241,7 @@ export default {
     restSearch() {
       // 表格 - 分页
       this.pageInfo = {
-        size: 10,
+        size: 15,
         curr: 1,
         total: 0,
       };
@@ -250,7 +250,7 @@ export default {
         level: "", // 姓名
         role_name: "",
         page: 1, // 页码
-        size: 10, // 每页显示条数
+        size: 15, // 每页显示条数
       };
       this.searchList();
     },

src/views/purchaseIn/storeAnomaly/index.vue

@@ -260,10 +260,16 @@ export default {
         });
     },
     restSearch() {
+       // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       this.parmValue = {
         status: "", //
         page: 1, // 页码
-        size: 10, // 每页显示条数
+        size: 15, // 每页显示条数
       };
       this.searchList();
     },

src/views/purchaseIn/storeManage/detail.vue

@@ -128,7 +128,13 @@ export default {
         username: "", // 账号
         status: "", //
         page: 1, // 页码
-        size: 10, // 每页显示条数
+        size: 15, // 每页显示条数
+      };
+       // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
       };
       this.searchList();
     },

src/views/purchaseIn/storeManage/index.vue

@@ -267,7 +267,13 @@ export default {
     restSearch() {
       this.parmValue = {
         page: 1, // 页码
-        size: 10, // 每页显示条数
+        size: 15, // 每页显示条数
+      };
+       // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
       };
       this.searchList();
     },

src/views/purchaseIn/storeManageFlow/components/newSetStock.vue

@@ -459,6 +459,12 @@ export default {
     },
 
     restSearch() {
+       // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       //重置入参
       this.ruleForm = {};
       // this.searchList();

src/views/purchaseIn/storeManageFlow/index.vue

@@ -49,6 +49,12 @@ export default {
 
   methods: {
     restSearch() {
+       // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       this.parmValue = {};
       this.searchList();
     },

src/views/purchaseIn/storeSet/index.vue

@@ -358,6 +358,12 @@ export default {
       });
     },
     restSearch() {
+       // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       this.supplierNo = [];
       this.input = "";
       this.select = "1";

src/views/report/index.vue

@@ -246,12 +246,18 @@ export default {
   },
   methods: {
     restSearch() {
+       // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       this.parmValue = {
         loginName: "", // 账户
         fullName: "", // 姓名
         type: 2, // 用户类型（1运营人员 2物业人员）
         page: 1, // 页码
-        size: 10, // 每页显示条数
+        size: 15, // 每页显示条数
       };
       this.searchList();
     },

src/views/search/standBook/index.vue

@@ -130,6 +130,12 @@ export default {
   mounted() {},
   methods: {
     restSearch() {
+       // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       // console.log("123456789");
       this.value = "1";
       this.parmValue = {

src/views/sellOut/consultOrder/index.vue

@@ -371,6 +371,12 @@ export default {
       }
     },
     restSearch() {
+           // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       this.select = "1";
       this.input = "";
       this.customerCode = [];

src/views/sellOut/goodsAnomaly/index.vue

@@ -258,10 +258,16 @@ export default {
         });
     },
     restSearch() {
+           // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       this.parmValue = {
         status: "", //
         page: 1, // 页码
-        size: 10, // 每页显示条数
+        size: 15, // 每页显示条数
       };
       this.searchList();
     },

src/views/sellOut/goodsBack/index.vue

@@ -261,7 +261,7 @@ export default {
       this.parmValue = {
         status: "", //
         page: 1, // 页码
-        size: 10, // 每页显示条数
+        size: 15, // 每页显示条数
       };
       this.searchList();
     },

src/views/stock/allot/index.vue

@@ -246,6 +246,12 @@ export default {
     },
     // 重置搜索框
     restSearch() {
+           // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       this.parmValue = {
         allot_code: "", //调拨编号
         wsm_in: "", //入仓库名称
@@ -253,7 +259,7 @@ export default {
         start: "", //开始日期
         end: "", //结束日期
         page: 1, // 页码
-        size: 10, // 每页显示条数
+        size: 15, // 每页显示条数
       };
       this.searchList();
     },

src/views/stock/check/components/addEdit.vue

@@ -13,8 +13,13 @@
           <el-form-item label="盘点公司" prop="wsm_supplier">
             <search-supplier
               :value="ruleForm.wsm_supplier"
-              :disabled="status !== '0'"
-              :isDetail="id !== 'add'"
+              :disabled="
+                !(
+                  id === 'add' ||
+                  (status === '0' && powers.some((item) => item == '005'))
+                )
+              "
+              :is-detail="id !== 'add'"
               :placeholder="'请选择盘点公司'"
               :names="companyName"
               @searchChange="supplierChange"
@@ -25,8 +30,13 @@
           <el-form-item label="盘点仓库" prop="wsm_code">
             <search-stock
               :value="ruleForm.wsm_code"
-              :isDetail="true"
-              :disabled="status !== '0'"
+              :disabled="
+                !(
+                  id === 'add' ||
+                  (status === '0' && powers.some((item) => item == '005'))
+                )
+              "
+              :is-detail="id !== 'add'"
               :placeholder="'请选择盘点仓库'"
               :isRelation="true"
               :companyCode="companyCode"
@@ -40,7 +50,12 @@
             <el-select
               v-model="ruleForm.type"
               placeholder="请选择盘点类型"
-              :disabled="status !== '0'"
+              :disabled="
+                !(
+                  id === 'add' ||
+                  (status === '0' && powers.some((item) => item == '005'))
+                )
+              "
               style="width: 100%"
             >
               <el-option
@@ -54,29 +69,37 @@
           </el-form-item>
         </el-col>
         <el-col :span="24" style="text-align: right">
-          <el-button
-            @click="deleteById()"
-            plain
-            v-if="status !== '4'"
-            type="danger"
-            >作废盘点申请
-          </el-button>
           <el-button
             type="primary"
-            v-if="status === '1'"
-            plain
             @click="submitForm"
-            >取消流程
-          </el-button>
-          <el-button type="primary" @click="submitForm" v-if="status === '0'"
+            v-if="
+              id === 'add' ||
+              (status === '0' && powers.some((item) => item == '005'))
+            "
             >保 存
           </el-button>
           <el-button
             type="primary"
-            @click="submitForm(true)"
-            v-if="status === '0'"
-            >保存并发起流程
+            @click="statusConfirm('1', '发起审核流程')"
+            v-if="status === '0' && powers.some((item) => item == '012')"
+            >发起审核流程
           </el-button>
+          <el-button
+            @click="statusConfirm('0', '取消审核流程')"
+            plain
+            v-if="status === '1' && powers.some((item) => item == '014')"
+            >取消审核流程</el-button
+          >
+          <el-button
+            @click="statusConfirm('-1', '作废该条信息')"
+            type="danger"
+            plain
+            v-if="
+              (status === '0' || status === '1') &&
+              powers.some((item) => item == '015')
+            "
+            >作废该条信息</el-button
+          >
         </el-col>
       </el-row>
     </el-form>
@@ -95,6 +118,19 @@ export default {
   name: "addEdit",
   props: ["id"],
   mixins: [resToken],
+  computed: {
+    powers() {
+      let tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "checkDetail"
+        ) || {};
+      if (tran && tran.action && tran.action.length > 0) {
+        return tran.action;
+      } else {
+        return [];
+      }
+    },
+  },
   data() {
     return {
       status: "0",
@@ -103,14 +139,14 @@ export default {
       loading: false,
       showGoodsModel: false,
       typeList: [
-        {
-          value: "1",
-          label: "全盘",
-        },
         {
           value: "2",
           label: "抽盘",
         },
+        {
+          value: "1",
+          label: "全盘",
+        },
       ],
       columns: columns,
       ruleForm: {
@@ -162,6 +198,59 @@ export default {
     closeModel() {
       console.log("closeModel!!");
     },
+    async statusConfirm(status, message) {
+      await this.$confirm(`确定要${message}？`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          if (status === "-1") {
+            await this.deleteById(message);
+          } else {
+            await this.setStatus(status, message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+    async deleteById(message) {
+      const res = await asyncRequest.delete({ id: this.id });
+      if (res && res.code === 0) {
+        this.$notify.success({
+          title: message + "成功！",
+          message: "",
+        });
+
+        this.routeGoto("check", {});
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
+
+    async setStatus(status, message) {
+      let model = {
+        id: this.id,
+        remark: "",
+        status: status,
+      };
+      const res = await asyncRequest.status(model);
+      this.loading = false;
+      if (res && res.code === 0) {
+        this.$notify.success({
+          title: message + "成功！",
+          message: "",
+        });
+        this.initForm();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
+      }
+    },
     //供应商选择
     supplierChange(e) {
       if (e && e.id) {
@@ -184,33 +273,6 @@ export default {
       }
       this.$refs.ruleForm.validateField("wsm_code");
     },
-    async deleteById() {
-      await this.$confirm("确定要作废？", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          const model = {
-            id: this.id,
-          };
-          const res = await asyncRequest.delete(model);
-          if (res && res.code === 0) {
-            this.$notify.success({
-              title: "作废成功！",
-              message: "",
-            });
-            this.routeGoto("check", {});
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
-          }
-        })
-        .catch(() => {
-          console.log("取消");
-        });
-    },
     async initForm() {
       this.loading = true;
       if (this.id === "add") {
@@ -227,10 +289,10 @@ export default {
     async initData() {
       const res = await asyncRequest.detail({ id: this.id });
       if (res && res.code === 0 && res.data) {
-        const { status, type, wsm_code } = res.data;
+        const { status, type, wsm_code,supplierNo,supplier_name } = res.data;
         this.status = status;
-        this.companyCode = "GYS-20210517-0009";
-        this.companyName = "北京长跃科技发展有限公司";
+        this.companyCode = supplierNo;
+        this.companyName = supplier_name;
         this.ruleForm = {
           wsm_code: [wsm_code],
           type: type,
@@ -261,13 +323,11 @@ export default {
       let arr = JSON.parse(JSON.stringify(list));
       return arr.join(",");
     },
-    async submitForm(status) {
+    async submitForm() {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           this.loading = true;
-          const { wsm_code, type, good_type_code } = JSON.parse(
-            JSON.stringify(this.ruleForm)
-          );
+          const { wsm_code, type } = JSON.parse(JSON.stringify(this.ruleForm));
           const model = {
             id: this.id,
             wsm_code: this.getId(wsm_code) || "", // 盘点仓库
@@ -288,9 +348,9 @@ export default {
               message: "",
             });
             // 刷新
-            this.$emit("refresh");
-            if (status) {
-              await this.setProcess("1");
+            if (this.id === "add") {
+              this.showModelThis = false;
+              this.$emit("refresh", false);
             }
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();

src/views/stock/check/detail.vue

@@ -123,12 +123,18 @@ export default {
 
   methods: {
     restSearch() {
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       this.parmValue = {
         name: "", // 业务员名字
         username: "", // 账号
         status: "", //
         page: 1, // 页码
-        size: 10, // 每页显示条数
+        size: 15, // 每页显示条数
       };
       this.searchList();
     },
@@ -157,10 +163,8 @@ export default {
               message: "",
             });
 
-            window.vm.$router.push({
-              path: "check",
-            });
-            // this.routeGoto("check", {});
+        
+            this.routeGoto("check", {});
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {

src/views/stock/check/index.vue

@@ -336,6 +336,12 @@ export default {
 
   methods: {
     restSearch() {
+        // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       this.parmValue = {
         wsm_code: "", // 盘点仓库
         check_code: "", // 	盘点编号

src/views/stock/my-test/index.vue

@@ -295,12 +295,18 @@ export default {
 
   methods: {
     restSearch() {
+        // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       this.parmValue = {
         name: "", // 业务员名字
         username: "", // 账号
         status: "", //
         page: 1, // 页码
-        size: 10, // 每页显示条数
+        size: 15, // 每页显示条数
       };
       this.searchList();
     },

src/views/stock/stockCount/components/dataWeido/index.vue

@@ -345,12 +345,18 @@ export default {
 
   methods: {
     restSearch() {
+        // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       this.parmValue = {
         name: "", // 业务员名字
         username: "", // 账号
         status: "", //
         page: 1, // 页码
-        size: 10, // 每页显示条数
+        size: 15, // 每页显示条数
       };
       this.searchList();
     },

src/views/stock/stockCount/components/productWeido/index.vue

@@ -269,6 +269,12 @@ export default {
   methods: {
     //重置参数
     restSearch() {
+        // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       this.parmValue = {};
       this.searchList();
     },

src/views/stock/stockCount/components/spaceCount/index.vue

@@ -268,6 +268,12 @@ export default {
 
   methods: {
     restSearch() {
+        // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       this.parmValue = {};
       this.searchList();
     },

src/views/stock/stockCount/index.vue

@@ -176,12 +176,18 @@ export default {
       }
     },
     restSearch() {
+        // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       this.parmValue = {
         name: "", // 业务员名字
         username: "", // 账号
         status: "", //
         page: 1, // 页码
-        size: 10, // 每页显示条数
+        size: 15, // 每页显示条数
       };
       this.searchList();
     },

src/views/stock/stockWarning/index.vue

@@ -286,6 +286,12 @@ export default {
 
   methods: {
     restSearch() {
+        // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       this.parmValue = {
         // name: "", // 业务员名字
         // username: "", // 账号

src/views/stock/survey/index.vue

@@ -246,6 +246,12 @@ export default {
       console.log(e);
     },
     restSearch() {
+        // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       //清空入参参数
       // this.parmValue = {
       //   name: "", // 业务员名字

src/views/system/updates/index.vue

@@ -20,13 +20,13 @@
               class="demo-table-expand"
             >
               <el-form-item label="更新内容">
-                <p v-html="props.row.system"></p>
+                <p v-html="props.row.content"></p>
               </el-form-item>
             </el-form>
           </template>
         </el-table-column>
         <el-table-column label="版本号" prop="version"> </el-table-column>
-        <el-table-column label="更新模块" prop="module"> </el-table-column>
+        <el-table-column label="更新模块" prop="title"> </el-table-column>
         <el-table-column label="更新时间" prop="addtime"> </el-table-column>
       </el-table>
       <div
@@ -94,6 +94,12 @@ export default {
   },
   methods: {
     restSearch() {
+        // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
       this.parmValue = {
         type: "VER",
         page: 1, // 页码