修改入库

src/apis/service/purchaseIn/wsmInOrder/index.js

@@ -13,7 +13,7 @@ export default {
   // 更新
   update: (data, params) => http(api + "update", data, "post", params),
   // 修改状态
-  status: (data, params) => http(api + "accountstatus", data, "post", params),
+  status: (data, params) => http(api + "orderincheck", data, "post", params),
   // 入库退货
   returnsend: (data, params) => http(api + "returnsend", data, "post", params),
 

src/views/purchaseIn/wsmInOrder/columns.js

@@ -1,37 +1,37 @@
 const columns = [
   {
-    prop: 'wsm_in_code',
-    label: '入库单编号',
-    width: '155'
+    prop: "wsm_in_code",
+    label: "入库单编号",
+    width: "155",
   },
   {
-    prop: 'cgdNo',
-    label: '采购单编号',
-    width: '155px'
+    prop: "cgdNo",
+    label: "采购单编号",
+    width: "155px",
   },
   {
-    prop: 'has_account',
-    label: '供应商端',
-    _slot_: 'has_account',
-    width: '120px'
+    prop: "has_account",
+    label: "供应商端",
+    _slot_: "has_account",
+    width: "120px",
   },
   {
-    prop: 'status',
-    label: '状态',
-    _slot_: 'status',
-    width: '110px'
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    width: "110px",
   },
   {
-    prop: 'order_source',
-    label: '订单来源',
-    _slot_: 'order_source',
-    width: '118px'
+    prop: "order_source",
+    label: "订单来源",
+    _slot_: "order_source",
+    width: "118px",
   },
   {
-    prop: 'order_type',
-    label: '商品类型',
-    _slot_: 'order_type',
-    width: '118px'
+    prop: "order_type",
+    label: "商品类型",
+    _slot_: "order_type",
+    width: "118px",
   },
 
   // {
@@ -51,26 +51,26 @@ const columns = [
   // },
 
   {
-    prop: 'spuCode',
-    label: '商品成本编号',
-    width: '145px'
+    prop: "spuCode",
+    label: "商品成本编号",
+    width: "145px",
   },
   {
-    prop: 'good_name',
-    label: '商品名称',
-    _slot_: 'good_name',
-    'min-width': '145px'
+    prop: "good_name",
+    label: "商品名称",
+    _slot_: "good_name",
+    "min-width": "145px",
   },
   {
-    prop: 'brand_name',
-    label: '品牌',
-    width: '95px'
+    prop: "brand_name",
+    label: "品牌",
+    width: "95px",
   },
 
   {
-    prop: 'send_num',
-    label: '发货数量',
-    width: '80px'
+    prop: "send_num",
+    label: "发货数量",
+    width: "80px",
   },
   // {
   //   prop: "post_company",
@@ -83,9 +83,9 @@ const columns = [
   //   width: "140px",
   // },
   {
-    prop: 'post_fee',
-    label: '物流费用',
-    width: '100px'
+    prop: "post_fee",
+    label: "物流费用",
+    width: "100px",
   },
 
   // {
@@ -141,24 +141,24 @@ const columns = [
   //   width: "145px",
   // },
   {
-    prop: 'companyNo',
-    label: '业务公司编码',
-    width: '155px'
+    prop: "companyNo",
+    label: "业务公司编码",
+    width: "155px",
   },
   {
-    prop: 'companyName',
-    label: '业务公司名称',
-    width: '155px'
+    prop: "companyName",
+    label: "业务公司名称",
+    width: "155px",
   },
   {
-    prop: 'supplierNo',
-    label: '供应商编码',
-    width: '155px'
+    prop: "supplierNo",
+    label: "供应商编码",
+    width: "155px",
   },
   {
-    prop: 'supplier_name',
-    label: '供应商名称',
-    width: '155px'
+    prop: "supplier_name",
+    label: "供应商名称",
+    width: "155px",
   },
   // {
   //   prop: 'wsm_supplier',
@@ -171,9 +171,9 @@ const columns = [
   //   width: '172px'
   // },
   {
-    prop: 'wsm_name',
-    label: '仓库名称',
-    width: '80px'
+    prop: "wsm_name",
+    label: "仓库名称",
+    width: "80px",
   },
   // {
   //   prop: "company_name",
@@ -181,19 +181,19 @@ const columns = [
   //   minWidth: "150px",
   // },
   {
-    prop: 'cgder',
-    label: '供应商负责人',
-    width: '95'
+    prop: "cgder",
+    label: "供应商负责人",
+    width: "95",
   },
   {
-    prop: 'good_creater',
-    label: '商品创建人',
-    width: '85px'
+    prop: "good_creater",
+    label: "商品创建人",
+    width: "85px",
   },
   {
-    prop: 'sendtime',
-    label: '发货时间',
-    width: '145px'
+    prop: "sendtime",
+    label: "发货时间",
+    width: "145px",
   },
   // {
   //   prop: "addtime",
@@ -201,13 +201,23 @@ const columns = [
   //   width: "145px",
   // },
   {
-    prop: '',
-    label: '操作',
-    fixed: 'right',
+    prop: "",
+    label: "操作",
+    fixed: "right",
     _noset_: true,
-    width: '50px',
-    _slot_: 'operation'
-  }
-]
+    width: "50px",
+    _slot_: "operation",
+  },
+];
 
-export { columns }
+const statusOptions = [
+  {
+    value: "1",
+    label: "待库管验货",
+  },
+  {
+    value: "2",
+    label: "入库完成",
+  },
+];
+export { columns, statusOptions };

src/views/purchaseIn/wsmInOrder/components/wsm-in.vue

@@ -22,10 +22,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="实际总数量" prop="wsm_num">
+          <el-form-item label="实际入库总数" prop="wsm_num">
             <el-input
-              placeholder="实际总数量"
-              :disabled="status + '' !== '2'"
+              placeholder="实际入库总数"
               v-model="ruleForm.wsm_num"
               maxlength="100"
             >
@@ -34,20 +33,14 @@
         </el-col>
 
         <el-col :span="8" style="text-align: right; padding: 0 0 10px 0">
-          <el-button
-            :size="'mini'"
-            v-if="status + '' === '2' && ppowers.some((i) => i == '2')"
-            type="primary"
-            @click="submitForm"
-            >保 存
-          </el-button>
+          <el-button :size="'mini'" type="primary" @click="submitForm">保 存 </el-button>
         </el-col>
       </el-row>
     </el-form>
   </div>
 </template>
 <script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
+import asyncRequest from "@/apis/service/purchaseIn/wsmInOrder";
 import resToken from "@/mixins/resToken";
 import { isMobile, isLicense, isnumber, isPhone } from "@/utils/validate";
 export default {
@@ -99,16 +92,8 @@ export default {
       modelitem: null,
       modelId: "",
       ruleForm: {
-        wsm_in_code: "",
         send_num: "",
         wsm_num: "",
-        reissue_num: "",
-        return_num: "",
-        contactor: "",
-        addr: "",
-        mobile: "",
-        error_remark: "",
-        remark: "",
       },
       rules: {
         wsm_num: {
@@ -116,36 +101,6 @@ export default {
           validator: validateWeight,
           trigger: "blur",
         },
-        reissue_num: {
-          required: true,
-          validator: validateWeight,
-          trigger: "blur",
-        },
-        return_num: {
-          required: true,
-          validator: validateWeight,
-          trigger: "blur",
-        },
-        contactor: {
-          required: true,
-          message: "收件联系人不能为空！",
-          trigger: "blur",
-        },
-        addr: {
-          required: true,
-          message: "收件地址不能为空！",
-          trigger: "blur",
-        },
-        mobile: {
-          required: true,
-          validator: validatemobile,
-          trigger: "blur",
-        },
-        error_remark: {
-          required: true,
-          message: "审核备注不能为空！",
-          trigger: "blur",
-        },
       },
     };
   },
@@ -172,29 +127,14 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          const { wsm_in_code, status, send_num, remark } = this.sitem;
-          const {
-            return_contactor,
-            return_addr,
-            return_mobile,
-            wsm_num,
-            reissue_num,
-            return_num,
-            error_remark,
-          } = this.sitem.return;
+          const { wsm_in_code, send_num } = this.sitem;
+          const { wsm_num } = this.sitem.return;
 
           this.status = status;
           this.ruleForm = {
             wsm_in_code: wsm_in_code || "",
             send_num: send_num || "0",
             wsm_num: wsm_num || "0",
-            reissue_num: reissue_num || "0",
-            return_num: return_num || "0",
-            contactor: return_contactor || "",
-            addr: return_addr || "",
-            mobile: return_mobile || "",
-            error_remark: error_remark || "",
-            remark: remark || "",
           };
         }
         if (this.$refs.tableForm) {
@@ -223,36 +163,25 @@ export default {
             return;
           }
           this.loading = true;
-          let item = JSON.parse(JSON.stringify(this.ruleForm));
-          let rnum = parseInt(item.return_num),
-            wnum = parseInt(item.wsm_num),
-            anum = parseInt(item.send_num),
-            renum = parseInt(item.reissue_num);
-
-          if (rnum + wnum !== anum) {
-            this.$message.warning("正常入库数量 + 异常退货数量 不等于 发货总数！");
-            this.loading = false;
-            return;
-          }
-          if (renum > rnum) {
-            this.$message.warning("异常补发数量不能大于异常退货数量！");
+          const { send_num, wsm_num } = this.ruleForm;
+          if (parseInt(send_num) < parseInt(wsm_num)) {
+            this.$message.warning("实际入库总数不能大于计划入库总数！");
             this.loading = false;
             return;
           }
 
-          delete item["send_num"];
-          const res = await asyncRequest.orderinreturn(item);
+          const { code, data, message } = await asyncRequest.status(this.ruleForm);
           this.loading = false;
-          if (res && res.code === 0) {
+          if (code === 0) {
             this.$notify.success({
               title: "提交成功",
               message: "",
             });
             this.$emit("refresh"); //抛出事件给详情页。
-          } else if (res && res.code >= 100 && res.code <= 104) {
+          } else if (code >= 100 && code <= 104) {
             await this.logout();
           } else {
-            this.$message.warning(res.message);
+            this.$message.warning(message);
           }
         } else {
           console.log("error submit!!");

src/views/purchaseIn/wsmInOrder/detail.vue

@@ -84,6 +84,8 @@
               />
             </el-collapse-item>
 
+            <!-- v-if="status == '0' && ppowers.some((i) => i == '0') && !isSupertube" -->
+
             <el-collapse-item title="入库验收" name="3">
               <wsm-in
                 v-if="newTime !== ''"
@@ -105,14 +107,6 @@
             :orderCode="queryId"
           />
         </el-tab-pane>
-        <el-tab-pane
-          label="物流进度"
-          name="3"
-          v-if="newTime !== '' && sitem && sitem.sendtype == '1' && status + '' !== '0'"
-        >
-          <logis-time-line v-if="newTime !== ''" :orderCode="sitem.post_code" />
-        </el-tab-pane>
-
         <el-tab-pane label="流程图" name="4" v-if="sitem.sendtype !== '2'">
           <flow-chart process_id="2" type="RKD" :orderCode="queryId" />
         </el-tab-pane>
@@ -130,6 +124,7 @@ import wsmIn from "./components/wsm-in";
 import ShowDataTableColumns from "./components/ShowDataTableColumns";
 import { cg_order_type_options } from "@/assets/js/statusList";
 import { mapGetters } from "vuex";
+import { statusOptions } from "./columns"; //表格列参数
 export default {
   name: "wsmInOrderDetail",
   mixins: [resToken],
@@ -159,62 +154,8 @@ export default {
       cg_order_type_options,
       sitem: null,
       status: "",
-      statusOptions: [
-        {
-          value: "0",
-          label: "待发货",
-        },
-        {
-          value: "1",
-          label: "待验货", //029
-        },
-        {
-          value: "2",
-          label: "待审核",
-        },
-        {
-          value: "3",
-          label: "待入库",
-        },
-        {
-          value: "4",
-          label: "入库完成",
-        },
-        {
-          value: "5", //30  || 32
-          label: "退货待物流",
-        },
-        {
-          value: "6",
-          label: "退货完成",
-        },
-      ],
-      statusList: [
-        {
-          code: "0",
-          label: "待发货",
-        },
-        {
-          code: "1",
-          label: "待验货",
-        },
-        {
-          code: "2",
-          label: "待审核",
-        },
-        {
-          code: "3",
-          label: "待入库",
-        },
-        {
-          code: "4",
-          label: "无退货入库成功",
-        },
-        {
-          code: "5",
-          label: "退货成功",
-        },
-      ],
+      statusOptions,
+
       newTime: "",
       loading: false,
       queryId: "",

src/views/purchaseIn/wsmInOrder/index.vue

@@ -306,7 +306,7 @@ import resToken from "@/mixins/resToken";
 import companyHelper from "@/mixins/companyHelper";
 import asyncRequest from "@/apis/service/purchaseIn/wsmInOrder";
 import { cg_order_type_options, cg_order_source_options, has_account_list } from "@/assets/js/statusList";
-import {columns} from "./columns"; //表格列参数
+import {columns,statusOptions} from "./columns"; //表格列参数
 import { mapGetters } from "vuex";
 
 export default {
@@ -340,16 +340,7 @@ export default {
       has_account_list,
 
       // 状态
-      statusOptions: [
-        {
-          value: "1",
-          label: "待库管验货",
-        },
-        {
-          value: "2",
-          label: "入库完成",
-        },
-      ],
+      statusOptions,
       loading: false,
       showModel: false,
       isDetail: false,