暂存

src/apis/service/sellOut/stockApply/index.js

@@ -4,19 +4,19 @@ const api = "admin/";
 export default {
   // 添加
   add: (data, params) => http(api + "purchadd", data, "post", params),
-  // 备货申请 删除
+  // 备库申请 删除
   delete: (data, params) => http(api + "purchdel", data, "post", params),
-  // 备货申请列表
+  // 备库申请列表
   list: (data, params) => http(api + "purchlist", data, "post", params),
-  // 备货详情
+  // 备库详情
   detail: (data, params) => http(api + "purchinfo", data, "post", params),
   // 更新申请单
   update: (data, params) => http(api + "purchedit", data, "post", params),
   // 备库状态更新
   status: (data, params) => http(api + "purchstatus", data, "post", params),
-  // 新建备货反馈
+  // 新建备库反馈
   addFee: (data, params) => http(api + "feedadd", data, "post", params),
-  // 备货反馈详情
+  // 备库反馈详情
   feeDetail: (data, params) => http(api + "feedinfo", data, "post", params),
   // 反馈状态修改
   feeChange: (data, params) => http(api + "feedchange", data, "post", params),

src/assets/js/btnList.js

@@ -27,8 +27,8 @@ const btnList = [
   { code: "026", name: "同意发货" },
   { code: "027", name: "取消发货" },
   { code: "028", name: "新建入库单" },
-  { code: "029", name: "备货入库验收" },
-  { code: "030", name: "备货入库验收审核" },
+  { code: "029", name: "备库入库验收" },
+  { code: "030", name: "备库入库验收审核" },
   { code: "031", name: "入库审核" },
   { code: "032", name: "退货物流" },
   { code: "033", name: "采购反馈物流费" },

src/views/process/columns.js

@@ -19,7 +19,7 @@ export default [
   },
   //采购
   {
-    name: "备货申请流程",
+    name: "备库申请流程",
     type: "BHD",
     toRouter: "/purchaseIn/stockApplyDetail",
     to: "id",

src/views/purchaseIn/purchaseOrder/columns.js

@@ -10,11 +10,11 @@ export default [
     label: "采购单编号",
     width: "155px",
   },
-  {
-    prop: "bkcode",
-    label: "备库单编号",
-    width: "155px",
-  },
+  // {
+  //   prop: "bkcode",
+  //   label: "备库单编号",
+  //   width: "155px",
+  // },
   {
     prop: "supplierNo",
     label: "采购供应商编号",
@@ -25,7 +25,7 @@ export default [
     label: "采购供应商名称",
     width: "155px",
   },
-  
+
   // {
   //   prop: "wsm_supplierNo",
   //   label: "仓库公司编号",
@@ -48,7 +48,7 @@ export default [
   // },
   {
     prop: "spuCode",
-    label: "商品属性编号",
+    label: "商品编号",
     width: "158px",
   },
   {
@@ -56,12 +56,8 @@ export default [
     label: "商品名称",
     'min-width': "145px",
   },
-  
-  {
-    prop: "cgder",
-    label: "采购员",
-    width: "60px",
-  },
+
+
   // 
   // {
   //   prop: "apply_name",
@@ -122,30 +118,34 @@ export default [
   {
     prop: "total_fee",
     label: "总货款",
-    width: "120px",
-  },
-  {
-    prop: "send_num",
-    label: "已发货数量",
     width: "110px",
   },
-  {
-    prop: "wsend_num",
-    label: "未发货数量",
-    width: "105px",
-  },
+  // {
+  //   prop: "send_num",
+  //   label: "已发货数量",
+  //   width: "110px",
+  // },
+  // {
+  //   prop: "wsend_num",
+  //   label: "未发货数量",
+  //   width: "105px",
+  // },
   {
     prop: "status",
     label: "状态",
     _slot_: "status",
     width: "110px",
   },
+  // {
+  //   prop: "lasttime",
+  //   label: "预计最晚入库时间",
+  //   width: "145px",
+  // },
   {
-    prop: "lasttime",
-    label: "预计最晚入库时间",
-    width: "145px",
+    prop: "cgder",
+    label: "采购员",
+    width: "60px",
   },
-
   {
     prop: "addtime",
     label: "创建时间",

src/views/purchaseIn/purchaseReturn/detail.vue

@@ -28,7 +28,7 @@
           type="primary"
           :size="'mini'"
           v-if="status === '1' && powers.some((item) => item == '014')"
-          >取消备货申请</el-button
+          >取消备库申请</el-button
         >
       </div>
 
@@ -271,7 +271,7 @@ export default {
         this.$message.warning(res.message);
       }
     },
-    // 发起备货申请
+    // 发起备库申请
     async setStatus(status, message) {
       let model = {
         id: this.sitem.id,

src/views/purchaseIn/wsmInOrder/detail.vue

@@ -73,7 +73,11 @@
                 @refresh="initData()"
               />
             </el-collapse-item>
-            <el-collapse-item title="入库验收审核" name="3">
+            <el-collapse-item
+              title="入库验收审核"
+              name="3"
+              v-if="status !== '4'"
+            >
               <wsm-in-order-check-form
                 v-if="newTime !== ''"
                 :id="queryId"
@@ -85,7 +89,10 @@
             </el-collapse-item>
             <el-collapse-item
               title="入库审核"
-              v-if="status == '3' && powers.some((item) => item == '031')"
+              v-if="
+                status == '3' &&
+                powers.some((item) => item == '031') 
+              "
             >
               <exam-form
                 :statusList="statusList"
@@ -167,11 +174,30 @@ export default {
       status: "",
       statusOptions: [
         // { value: "0", label: "取消" },
-        { value: "1", label: "入库验收" },
-        { value: "2", label: "入库验收审核" },
-        { value: "3", label: "同意下单" },
-        { value: "4", label: "发货中" },
-        { value: "5", label: "已发货" },
+        {
+          value: "0",
+          label: "待发货",
+        },
+        {
+          value: "1",
+          label: "待验货",
+        },
+        {
+          value: "2",
+          label: "待审核",
+        },
+        {
+          value: "3",
+          label: "待入库",
+        },
+        {
+          value: "4",
+          label: "无退货入库成功",
+        },
+        // {
+        //   value: "5",
+        //   label: "退货成功",
+        // },
       ],
       statusList: [
         {

src/views/sellOut/stockApply/detail.vue

@@ -8,32 +8,6 @@
           activeNames
         }}
       </p>
-      <!-- <div class="detail-page-title">
-        <span>备货申请编号：</span><span v-if="sitem">{{ sitem.bk_code }}</span>
-
-        <el-button
-          v-if="
-            powers.some((item) => item === '015') &&
-            (status === '0' || status === '1' || status === '2')
-          "
-          @click="statusConfirm('-1', '作废该条信息')"
-          type="danger"
-          plain
-          class="fr"
-          :size="'mini'"
-          style="margin: 0 0 0 12px"
-          >作废该条信息</el-button
-        >
-        <el-button
-          @click="statusConfirm('0', '取消审核流程')"
-          plain
-          class="fr"
-          type="primary"
-          :size="'mini'"
-          v-if="status === '1' && powers.some((item) => item == '014')"
-          >取消审核流程</el-button
-        >
-      </div> -->
       <status-bar
         v-if="newTime !== '' && queryType === 'view'"
         :newTime="newTime"
@@ -53,7 +27,7 @@
         </el-tab-pane>
         <el-tab-pane label="业务详情" name="1" v-if="queryType === 'view'">
           <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
-            <el-collapse-item name="1" title="备货详情">
+            <el-collapse-item name="1" title="备库详情">
               <add-edit
                 :sitem="sitem"
                 :id="queryId"
@@ -87,39 +61,6 @@
                 @refresh="initData"
               />
             </el-collapse-item>
-
-            <el-collapse-item
-              name="4"
-              title="同意采购"
-              v-if="status === '2' && powers.some((item) => item === '025')"
-            >
-              <el-row style="padding: 0 0 20px 0">
-                <el-col :span="2" offset="20">
-                  <el-button
-                    :disabled="
-                      !(status === '2' && powers.some((item) => item === '025'))
-                    "
-                    type="primary"
-                    size="small"
-                    @click="feeChange('同意反馈', '3')"
-                  >
-                    同 意
-                  </el-button>
-                </el-col>
-                <el-col :span="2">
-                  <el-button
-                    :disabled="
-                      !(status === '2' && powers.some((item) => item === '025'))
-                    "
-                    type="warning"
-                    size="small"
-                    @click="feeChange('拒绝反馈', '4')"
-                  >
-                    拒 绝
-                  </el-button>
-                </el-col>
-              </el-row>
-            </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
         <el-tab-pane label="审批记录" name="2" v-if="queryType === 'view'">
@@ -178,10 +119,8 @@ export default {
       sitem: null,
       status: "",
       statusOptions: [
-        { value: "0", label: "待发起审核流程" },
         { value: "1", label: "待采购反馈" },
-        { value: "2", label: "待同意采购" },
-        { value: "3", label: "已同意采购" },
+        { value: "2", label: "已生成采购单" },
         {
           value: "4",
           label: "已取消采购",
@@ -202,57 +141,6 @@ export default {
     }
   },
   methods: {
-    async feeChange(val, status) {
-      this.loading = true;
-      await this.$confirm(`确定要${val}？`, {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(async () => {
-          let res = {};
-          let model = {
-            id: this.sitem.id,
-            status,
-          };
-          if (status === "3") {
-            res = await asyncRequest.feeChange(model);
-            if (res && res.code === 0 && res.data) {
-              this.getNewTime();
-              this.$notify({
-                title: val + "成功",
-                message: "",
-                type: "success",
-              });
-              this.initData();
-            } else if (res && res.code >= 100 && res.code <= 104) {
-              await this.logout();
-            } else {
-            }
-          } else if (status === "4") {
-            res = await asyncRequest.feeChange(model);
-            if (res && res.code === 0 && res.data) {
-              this.getNewTime();
-              this.$notify({
-                title: val + "成功",
-                message: "",
-                type: "warning",
-              });
-              this.initData();
-            } else if (res && res.code >= 100 && res.code <= 104) {
-              await this.logout();
-            } else {
-              console.log("error");
-            }
-          } else {
-            await this.setStatus(status, message);
-          }
-        })
-        .catch(() => {
-          console.log("取消");
-        });
-      this.loading = false;
-    },
     async initData() {
       this.loading = true;
       const { code, data, message } = await asyncRequest.detail({
@@ -306,7 +194,7 @@ export default {
         this.$message.warning(res.message);
       }
     },
-    // 发起备货申请
+    // 发起备库申请
     async setStatus(status, message) {
       let model = {
         id: this.queryId,

src/views/sellOut/stockApply/index.vue

@@ -42,7 +42,7 @@
                     clearable
                     :size="searchSize"
                     v-model="parmValue.status"
-                    placeholder="备货申请状态"
+                    placeholder="备库申请状态"
                     @change="
                       pageInfo.curr = 1;
                       parmValue.page = 1;
@@ -95,7 +95,7 @@
                     placeholder="请选择"
                     style="width: 130px"
                   >
-                    <el-option label="备货申请编号" value="1" />
+                    <el-option label="备库申请编号" value="1" />
                     <el-option label="商品属性编号" value="2" />
                     <el-option label="商品名称" value="3" />
                     <el-option label="申请人" value="4" />
@@ -203,25 +203,13 @@ export default {
   data() {
     return {
       options: [
-        {
-          value: "0",
-          label: "待发起审核流程",
-        },
         {
           value: "1",
           label: "待采购反馈",
         },
         {
           value: "2",
-          label: "待同意采购",
-        },
-        {
-          value: "3",
-          label: "已同意采购",
-        },
-        {
-          value: "4",
-          label: "已取消采购",
+          label: "已生成采购单",
         },
       ],
       select: "1",