Merge branch 'sit'

src/apis/service/process/unRead/index.js

@@ -2,12 +2,13 @@
 import http from '@/apis/axios'
 const api = 'admin/'
 export default {
- // 分页查询
- list: (data, params) => http(api + 'msglist', data, 'post', params),
- // 详情
- detail: (data, params) => http(api + 'msginfo', data, 'post', params),
- // 修改状态
- status: (data, params) => http(api + 'msglimitread', data, 'post', params),
- // 全部标记未已读
- allStatus: (data, params) => http(api + 'msgallread', data, 'post', params),
+    // 分页查询
+    list: (data, params) => http(api + 'msglist', data, 'post', params),
+    // 详情
+    detail: (data, params) => http(api + 'msginfo', data, 'post', params),
+    // 修改状态
+    status: (data, params) => http(api + 'msglimitread', data, 'post', params),
+    // 全部标记未已读
+    allStatus: (data, params) => http(api + 'msgallread', data, 'post', params),
+
 }

src/views/process/read/index.vue

@@ -22,36 +22,52 @@
       "
     >
       <template #table-header="{}">
-        <div style="width: 100%; height: 30px">
-          <el-row :gutter="10">
-            <el-col :span="24">
-              <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((item) => item == '003')"
+        <el-row :gutter="10" style="padding: 0 0 0 80px; width: 100%">
+          <el-col :span="10" style="width: 230px">
+            <el-select
+              clearable
+              :size="'mini'"
+              style="width: 100%"
+              v-model="parmValue.order_type"
+              placeholder="订单类型"
+              @click="
+                pageInfo.curr = 1;
+                parmValue.page = 1;
+                searchList();
+              "
+            >
+              <el-option
+                v-for="item in process_router_list"
+                :key="item.type"
+                :label="item.name"
+                :value="item.type"
               >
-                <el-button
-                  :size="searchSize"
-                  type="success"
-                  style="float: right"
-                  @click="openModal('add', false)"
-                >
-                  添加
-                </el-button>
-              </el-col>
-            </el-col>
-          </el-row>
-        </div>
+              </el-option>
+            </el-select>
+          </el-col>
+          <el-col :span="10" style="width: 400px; padding: 0 0 0 10px">
+            <el-input
+              :size="'mini'"
+              v-model="parmValue.orderCode"
+              placeholder="订单编号"
+              @blur="
+                pageInfo.curr = 1;
+                parmValue.page = 1;
+                searchList();
+              "
+            ></el-input>
+          </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-row>
       </template>
       <!-- <template #status="{ scope }">
         <el-tag
@@ -111,6 +127,9 @@ export default {
       parmValue: {
         page: 1, // 页码
         size: 15, // 每页显示条数
+        is_read: "1",
+        order_type: "",
+        orderCode: "",
       },
       // 表格 - 数据
       tableData: [],
@@ -127,19 +146,19 @@ export default {
         total: 0,
       },
       // 表格 - 列参数
-      columns:columns 
+      columns: columns,
     };
   },
   mounted() {
-    this.searchProList();
+    // this.searchProList();
     this.searchList();
   },
   methods: {
     getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
         this.routeGoto(toRouter, { id: queryId, type: "view" });
-      }else{
-         this.$message.warning("暂未找到相关流程！");
+      } else {
+        this.$message.warning("暂未找到相关流程！");
       }
     },
 
@@ -153,6 +172,9 @@ export default {
       this.parmValue = {
         page: 1, // 页码
         size: 15, // 每页显示条数
+        is_read: "1",
+        order_type: "",
+        orderCode: "",
       };
       // this.searchProList();
       this.searchList();

src/views/process/unRead/index.vue

@@ -21,37 +21,73 @@
         searchList();
       "
     >
-      <template #table-header="{}">
-        <div style="width: 100%; height: 30px">
-          <el-row :gutter="10">
-            <el-col :span="24">
-              <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((item) => item == '003')"
+      <template #table-header="{ selection }">
+        <el-row :gutter="10" style="padding: 0 0 0 80px; width: 100%">
+          <el-col :span="10" style="width: 230px">
+            <el-select
+              clearable
+              :size="'mini'"
+              style="width: 100%"
+              v-model="parmValue.order_type"
+              placeholder="订单类型"
+              @click="
+                pageInfo.curr = 1;
+                parmValue.page = 1;
+                searchList();
+              "
+            >
+              <el-option
+                v-for="item in process_router_list"
+                :key="item.type"
+                :label="item.name"
+                :value="item.type"
               >
-                <el-button
-                  :size="searchSize"
-                  type="success"
-                  style="float: right"
-                  @click="openModal('add', false)"
-                >
-                  添加
-                </el-button>
-              </el-col>
-            </el-col>
-          </el-row>
-        </div>
+              </el-option>
+            </el-select>
+          </el-col>
+          <el-col :span="10" style="width: 400px; padding: 0 0 0 10px">
+            <el-input
+              :size="'mini'"
+              v-model="parmValue.orderCode"
+              placeholder="订单编号"
+              @blur="
+                pageInfo.curr = 1;
+                parmValue.page = 1;
+                searchList();
+              "
+            ></el-input>
+          </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: 90px; float: right">
+            <el-button
+              type="primary"
+              :size="searchSize"
+              style="float: right"
+              @click="changeStatus(selection, '全部标记为已读', 0)"
+            >
+              全部已读
+            </el-button>
+          </el-col>
+          <el-col :span="3" style="width: 66px; float: right">
+            <el-button
+              type="primary"
+              :size="searchSize"
+              style="float: right"
+              @click="changeStatus(selection, '批量标记为已读', 1)"
+            >
+              批量已读
+            </el-button>
+          </el-col>
+        </el-row>
       </template>
       <!-- <template #status="{ scope }">
         <el-tag
@@ -71,10 +107,7 @@
           content="详情"
           placement="top"
         >
-          <i
-            class="el-icon-view tb-icon"
-            @click="getRouter(scope.row.toRouter, scope.row.queryId)"
-          ></i>
+          <i class="el-icon-view tb-icon" @click="wentRead(scope.row)"></i>
         </el-tooltip>
       </template>
     </ex-table>
@@ -112,6 +145,9 @@ export default {
       parmValue: {
         page: 1, // 页码
         size: 15, // 每页显示条数
+        is_read: "0",
+        order_type: "",
+        orderCode: "",
       },
       // 表格 - 数据
       tableData: [],
@@ -128,10 +164,18 @@ export default {
         total: 0,
       },
       // 表格 - 列参数
-      columns: columns,
+      columns: [
+        {
+          type: "selection",
+          fixed: "left",
+          _noset_: true,
+        },
+        ...columns,
+      ],
     };
   },
   mounted() {
+    this.columns.unshift();
     this.searchList();
   },
   methods: {
@@ -153,9 +197,76 @@ export default {
       this.parmValue = {
         page: 1, // 页码
         size: 15, // 每页显示条数
+        is_read: "0",
+        order_type: "",
+        orderCode: "",
       };
       this.searchList();
     },
+    /**
+     * 启用/禁用
+     * @param {String} id id
+     * @param {String} status 0-禁用 1-启用
+     */
+    async changeStatus(selection, title, type) {
+      if (type === 1 && selection && selection.length === 0) {
+        this.$message.warning("至少选择一条数据！");
+        return;
+      }
+      await this.$confirm(`确定要${title}？`, {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          if (type === 1) {
+            let sitem = { id: [] };
+            selection.forEach((a) => {
+              sitem.id.push(a.id);
+            });
+            await this.set_status(title, type, sitem);
+          } else {
+            await this.set_status(title, type, {});
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+    async set_status(title, type, sitem) {
+      let res = {};
+      if (type === 1) {
+        res = await asyncRequest.status(sitem);
+      } else {
+        res = await asyncRequest.allStatus({});
+      }
+      const { code } = res;
+      if (code === 0) {
+        this.$notify.success({
+          title: title + "成功！",
+          message: "",
+        });
+        this.pageInfo.curr = 1;
+        this.parmValue.page = 1;
+        this.searchList();
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+      }
+    },
+
+    async wentRead(item) {
+      const { toRouter, queryId, id } = item;
+      const { code, data, message } = await asyncRequest.detail({ id: id });
+      if (code === 0) {
+        this.getRouter(toRouter, queryId);
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+      }
+    },
 
     // 刷新表格
     async searchList() {

src/views/purchaseIn/purchaseOrder/columns.js

@@ -170,6 +170,7 @@ const columns = [
   },
 ]
 const statusOptions = [
+  { value: "0", label: "待与供应商确认" },
   { value: "1", label: "待发货" },
   { value: "2", label: "部分发货" },
   { value: "3", label: "发货完成" },

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -80,6 +80,18 @@
                       ).label || '--'
                     "
                   ></el-tag>
+                  <el-tooltip
+                    class="fr"
+                    v-if="powers.some((item) => item == '007')"
+                    effect="dark"
+                    content="已于供应商确认"
+                    placement="top"
+                  >
+                    <i
+                      class="el-icon-video-play tb-icon"
+                      @click="statusConfirm()"
+                    ></i>
+                  </el-tooltip>
                 </template>
                 <template slot="order_type">
                   <el-tag
@@ -135,7 +147,11 @@
                 :iscgd="true"
               />
             </el-collapse-item>
-            <el-collapse-item title="入库单" name="3">
+            <el-collapse-item
+              title="入库单"
+              name="3"
+              v-if="sitem&&sitem.status !== '0'"
+            >
               <order-in-table
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -147,6 +163,7 @@
             <el-collapse-item
               title="工差单"
               name="4"
+              v-if="sitem&&sitem.status !== '0' && sitem.status !== '1'"
             >
               <work-diff-table
                 :newTime="newTime"
@@ -258,60 +275,35 @@ export default {
       }
       this.loading = false;
     },
-    async statusConfirm(status, message) {
-      await this.$confirm(`确定要${message}？`, {
+    async statusConfirm() {
+      await this.$confirm(`确定已与供应商确认？`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(async () => {
-          if (status === "-1") {
-            await this.deleteById(message);
+          let model = {
+            cgdNo: this.sitem.cgdNo,
+            status: "1",
+          };
+          const res = await asyncRequest.status(model);
+          this.loading = false;
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "提交成功！",
+              message: "",
+            });
+            await this.initData();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
           } else {
-            await this.setStatus(status, message);
+            this.$message.warning(res.message);
           }
         })
         .catch(() => {
           console.log("取消");
         });
     },
-
-    async deleteById(message) {
-      const res = await asyncRequest.delete({ id: this.queryId });
-      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, remark) {
-      let model = {
-        cgdNo: this.sitem.cgdNo,
-        remark: remark || "",
-        status: status,
-      };
-      const res = await asyncRequest.status(model);
-      this.loading = false;
-      if (res && res.code === 0) {
-        this.$notify.success({
-          title: message + "成功！",
-          message: "",
-        });
-        await this.initData();
-      } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
-      } else {
-        this.$message.warning(res.message);
-      }
-    },
   },
 };
 </script>

src/views/sellOut/sellAfterApply/detail.vue

@@ -22,9 +22,10 @@
                     :type="sitem.status == '0' ? 'warning' : ''"
                     v-text="
                       (
-                        statusOptions.find(
-                          (item) => item.value == sitem.status
-                        ) || {}
+                        (sitem.is_receive === '0'
+                          ? status1Options
+                          : status2Options
+                        ).find((item) => item.value == sitem.status) || {}
                       ).label || '--'
                     "
                   ></el-tag>
@@ -78,7 +79,7 @@
             <el-collapse-item title="商品信息" name="2">
               <show-goods-data-table
                 :newTime="newTime"
-                v-if="newTime !== ''"
+                v-if="newTime !== ''&&sitem"
                 :type="sitem.order_type"
                 :skucode="sitem.skuCode"
                 :spucode="sitem.good_code"
@@ -101,6 +102,7 @@
               title="采购审核"
               name="4"
               v-if="
+                sitem &&
                 sitem.order_type !== '1' &&
                 (status == '2' ||
                   status == '3' ||
@@ -119,7 +121,9 @@
               title="设置退货仓库"
               name="4"
               v-if="
-                sitem.order_type !== '1' && sitem.is_receive==='1'&&
+                sitem &&
+                sitem.order_type !== '1' &&
+                sitem.is_receive === '1' &&
                 ((status == '3' && powers.some((item) => item == '083')) ||
                   status == '4' ||
                   status == '5')
@@ -135,7 +139,7 @@
             <el-collapse-item
               title="用户退货"
               name="4"
-              v-if="sitem.order_type !== '1' && status == '4'"
+              v-if="sitem&&sitem.order_type !== '1' && status == '4'"
             >
               用户退货
             </el-collapse-item>
@@ -221,14 +225,26 @@ export default {
       sitem: null,
       newTime: "",
       loading: false,
-      statusOptions: [
-        { value: "1", label: "待业务审核" },
-        { value: "2", label: "待采购审核" },
-        { value: "3", label: "待设置仓库" },
-        { value: "4", label: "待客户退货" },
-        { value: "5", label: "售后已完成" },
-        { value: "6", label: "业务已驳回" },
-        { value: "7", label: "采购已驳回" },
+      // 收到货状态
+      status1Options: [
+        { id: "1", label: "待业务审核" },
+        { id: "2", label: "待采购审核" },
+        { id: "3", label: "待设置仓库" },
+        { id: "4", label: "待客户退货" },
+        { id: "5", label: "售后已完成" },
+        { id: "6", label: "业务已驳回" },
+        { id: "7", label: "采购已驳回" },
+        { id: "8", label: "申请已取消" },
+      ],
+      // 未收到货状态
+      statu2Options: [
+        { id: "1", label: "待业务审核" },
+        { id: "2", label: "待采购审核" },
+        { id: "3", label: "待同意退货" },
+        { id: "5", label: "售后已完成" },
+        { id: "6", label: "业务已驳回" },
+        { id: "7", label: "采购已驳回" },
+        { id: "8", label: "申请已取消" },
       ],
       orderCode: "",
       return_code: "",

src/views/sellOut/sellAfterApply/index.vue

@@ -160,9 +160,9 @@
         <template #status="{ scope }">
           <el-tag
             :size="tablebtnSize"
-            :type="scope.row.status == '0' ? 'warning' : ''"
+            :type="''"
             v-text="
-              (statusOptions.find((item) => item.id == scope.row.status) || {})
+              ((scope.row.is_receive==='0'?status1Options:status2Options).find((item) => item.id == scope.row.status) || {})
                 .label || '--'
             "
           ></el-tag>
@@ -258,8 +258,8 @@ export default {
         { id: "3", label: "供应商承担" },
       ],
       sitem: null,
-      // 状态
-      statusOptions: [
+      // 收到货状态
+      status1Options: [
         { id: "1", label: "待业务审核" },
         { id: "2", label: "待采购审核" },
         { id: "3", label: "待设置仓库" },
@@ -267,6 +267,17 @@ export default {
         { id: "5", label: "售后已完成" },
         { id: "6", label: "业务已驳回" },
         { id: "7", label: "采购已驳回" },
+        { id: "8", label: "申请已取消" },
+      ],
+       // 未收到货状态
+      status2Options: [
+        { id: "1", label: "待业务审核" },
+        { id: "2", label: "待采购审核" },
+        { id: "3", label: "待同意退货" },
+        { id: "5", label: "售后已完成" },
+        { id: "6", label: "业务已驳回" },
+        { id: "7", label: "采购已驳回" },
+        { id: "8", label: "申请已取消" },
       ],
       statusList: statusList,
       loading: false,

src/views/sellOut/sellOutOrder/detail.vue

@@ -68,7 +68,7 @@
             <el-collapse-item
               title="库管发货"
               name="3"
-              v-if="status === '0' && powers.some((item) => item == '080')"
+              v-if="status === '1' && powers.some((item) => item == '080')"
             >
               <want-deliver
                 :newTime="newTime"
@@ -108,6 +108,22 @@
                       ).label || '--'
                     "
                   ></el-tag>
+
+                  <el-tooltip
+                    class="fr"
+                    effect="dark"
+                    content="详情"
+                    placement="top"
+                  >
+                    <i
+                      class="el-icon-view tb-icon"
+                      @click="
+                        routeGoto('sellOutOrderDetail', {
+                          id: scope.row.outCode,
+                        })
+                      "
+                    ></i>
+                  </el-tooltip>
                 </template>
                 <template slot="order_type">
                   <el-tag
@@ -241,7 +257,7 @@ export default {
         { id: "4", label: "项目咨询单销售" },
       ],
       statusOptions: [
-        { value: "0", label: "待发货" },
+        { value: "0", label: "待采购备货" },
         { value: "1", label: "待库管发货" },
         { value: "2", label: "待收货" },
         { value: "3", label: "已收货" },