build

src/views/sellOut/beforeReturnGoodWorkOrder/index.vue

@@ -30,7 +30,6 @@
                   :size="searchSize"
                   v-model="parmValue.use_type"
                   filterable
-                  clearable
                   placeholder="平台类型"
                   @change="
                     pageInfo.curr = 1;

src/views/sellOut/deliveryWorkOrder/index.vue

@@ -30,7 +30,6 @@
                   :size="searchSize"
                   v-model="parmValue.use_type"
                   filterable
-                  clearable
                   placeholder="平台类型"
                   style="width: 100%"
                   @change="

src/views/sellOut/returnGoodWorkOrder/index.vue

@@ -30,7 +30,6 @@
                   :size="searchSize"
                   v-model="parmValue.use_type"
                   filterable
-                  clearable
                   placeholder="平台类型"
                   @change="
                     pageInfo.curr = 1;
@@ -368,7 +367,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
-        use_type: "",
+        use_type: "1",
         type: "",
         order_type: "",
         returnCode: "",
@@ -527,7 +526,8 @@ export default {
       this.select = "outChildCode"; //清除下拉框选中项
 
       this.parmValue = {
-        order_type: "",
+        use_type: "1",
+        order_type: "1",
         company_name: "", //申请人部门
         good_code: "",
         returnCode: "", //销售退货code

src/views/sellOut/salesOrder/index.vue

@@ -61,7 +61,6 @@
                   :size="searchSize"
                   v-model="parmValue.use_type"
                   filterable
-                  clearable
                   placeholder="平台类型"
                   style="width: 100%"
                   @change="

src/views/sellOut/sellAfterApply/index.vue

@@ -386,7 +386,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
-        use_type: "",
+        use_type: "1",
         has_account: "",
         order_source: "",
         good_code: "", //商品编码
@@ -561,6 +561,7 @@ export default {
       this.select = "serviceNum";
       this.s_input = "";
       this.parmValue = {
+        use_type:'1',
         order_type: "",
         customer_code: "", //客户公司code
         start: "",

src/views/sellOut/sellOutOrder/index.vue

@@ -93,7 +93,6 @@
                   :size="searchSize"
                   v-model="parmValue.use_type"
                   filterable
-                  clearable
                   placeholder="平台类型"
                   style="width: 100%"
                   @change="

src/views/sellOut/sellReturn/index.vue

@@ -30,7 +30,6 @@
                   :size="searchSize"
                   v-model="parmValue.use_type"
                   filterable
-                  clearable
                   placeholder="平台类型"
                   style="width: 100%"
                   @change="

src/views/sellOut/stockApply/columns.js

@@ -71,7 +71,7 @@ const columns = [
     label: '操作',
     fixed: 'right',
     _noset_: true,
-    width: '50px',
+    width: '80px',
     _slot_: 'operation'
   }
 ]

src/views/sellOut/stockApply/detail.vue

@@ -1,12 +1,6 @@
 <template>
   <div class="stockApplyDetail pagePadding">
     <div v-if="powers.some((i) => i == '007')">
-      <!-- <status-bar
-        v-if="newTime !== '' && queryType === 'view'"
-        :newTime="newTime"
-        :options="statusOptions"
-        :status="status"
-      /> -->
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="新建备库申请单" name="0" v-if="queryType === 'add'">
           <add-edit
@@ -159,8 +153,18 @@ export default {
       sitem: null,
       status: "",
       statusOptions: [
-        { value: "1", label: "待采购反馈" },
-        { value: "2", label: "已生成采购单" },
+      {
+          value: "1",
+          label: "待采购反馈",
+        },
+        {
+          value: "2",
+          label: "已生成采购单",
+        },
+        {
+          value : "3",
+          label:'备货申请已取消'
+        },
         {
           value: "4",
           label: "已取消采购",

src/views/sellOut/stockApply/index.vue

@@ -180,9 +180,20 @@
           >
             <i
               class="el-icon-view tb-icon"
-              
               @click="getRouter('stockApplyDetail', scope.row.id )"
-            ></i>
+            />
+          </el-tooltip>
+
+          <el-tooltip  
+            effect="dark"
+            content="撤销"
+            placement="top"
+            v-if="String(scope.row.status) === '1' && powers.includes('006') && !isSupertube"
+          >
+            <i
+              class="el-icon-refresh tb-icon"
+              @click="handleBack(scope.row)"
+            />
           </el-tooltip>
         </template>
       </ex-table>
@@ -199,6 +210,7 @@ import companyHelper from "@/mixins/companyHelper"
 import asyncRequest from "@/apis/service/sellOut/stockApply";
 import { mapGetters } from "vuex";
 import { columns } from "./columns";
+import { MessageBox } from "element-ui";
 export default {
   name: "stockApply",
   mixins: [mixinPage, resToken, companyHelper],
@@ -222,6 +234,10 @@ export default {
           value: "2",
           label: "已生成采购单",
         },
+        {
+          value : "3",
+          label:'备货申请已取消'
+        }
       ],
       select: "1",
       input: "",
@@ -290,6 +306,25 @@ export default {
   },
 
   methods: {
+    handleBack(row){
+      MessageBox.confirm("是否确认撤销该备货申请?").then(async () => {
+        const { id } = row;
+       
+        const { code, message } = await asyncRequest.status({
+          id,
+          status: "3",
+        });
+
+        switch (code) {
+          case 0:
+            this.searchList();
+            break;
+          default:
+            this.$message.warning(message);
+            break;
+        }
+      });
+    },
     async supplierChange(e) {
       const {code} = e;
       this.parmValue.supplierNo = code ? [code] : [];

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/index.vue

@@ -30,7 +30,6 @@
                   :size="searchSize"
                   v-model="parmValue.use_type"
                   filterable
-                  clearable
                   placeholder="平台类型"
                   @change="
                     pageInfo.curr = 1;

src/views/supplierSellOut/supplierDeliveryWorkOrder/index.vue

@@ -30,7 +30,6 @@
                   :size="searchSize"
                   v-model="parmValue.use_type"
                   filterable
-                  clearable
                   placeholder="平台类型"
                   style="width: 100%"
                   @change="

src/views/supplierSellOut/supplierReturnWorkOrder/index.vue

@@ -113,7 +113,6 @@
                  :size="searchSize"
                  v-model="parmValue.use_type"
                  filterable
-                 clearable
                  placeholder="平台类型"
                  @change="
                    pageInfo.curr = 1;
@@ -315,6 +314,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
+        use_type : "1",
         type:'',
         order_type: "",
         returnCode:"",
@@ -469,6 +469,7 @@ export default {
       this.select = "outChildCode"; //清除下拉框选中项
 
       this.parmValue = {
+        use_type:'1',
         order_type: "",
         company_name: "", //申请人部门
         good_code:"",

src/views/supplierSellOut/supplierSellAfterApply/index.vue

@@ -135,7 +135,6 @@
                   :size="searchSize"
                   v-model="parmValue.use_type"
                   filterable
-                  clearable
                   placeholder="平台类型"
                   @change="
                     pageInfo.curr = 1;
@@ -388,6 +387,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
+        use_type : "1",
         good_code: "", //商品编码
         orderCode: "",
         outCode: "",
@@ -516,6 +516,7 @@ export default {
       this.select = "serviceNum";
       this.s_input = "";
       this.parmValue = {
+        use_type: "1",
         order_type: "", 
         customer_code: "", //客户公司code
         start: "",

src/views/supplierSellOut/supplierSellOutOrder/index.vue

@@ -93,7 +93,6 @@
                   :size="searchSize"
                   v-model="parmValue.use_type"
                   filterable
-                  clearable
                   placeholder="平台类型"
                   style="width: 100%"
                   @change="

src/views/supplierSellOut/supplierSellReturn/index.vue

@@ -30,7 +30,6 @@
                   :size="searchSize"
                   v-model="parmValue.use_type"
                   filterable
-                  clearable
                   placeholder="平台类型"
                   style="width: 100%"
                   @change="