dingdan

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

@@ -7,7 +7,7 @@ export default {
   // 删除
   delete: (data, params) => http(api + "delete", data, "post", params),
   // 分页查询
-  list: (data, params) => http(api + "orderbacklist", data, "post", params),
+  list: (data, params) => http(api + "list", data, "post", params),
   // 详情
   detail: (data, params) => http(api + "detail", data, "post", params),
   // 更新

src/components/globalComponents/status-bar/main.vue

@@ -1,16 +1,12 @@
 <template>
-  <div class="statusBar" style="padding: 0 0 12px 0;">
+  <div class="statusBar" style="padding: 0 0 12px 0">
     <el-steps :active="sIndex" align-center>
-      
-            <!-- : index === sIndex
+      <!-- : index === sIndex
             ? 'el-icon-s-check' -->
-            
+
       <el-step
         :title="item.label"
-        :icon="
-          index <= sIndex
-            ? 'el-icon-success': ''
-        "
+        :icon="index <= sIndex ? 'el-icon-success' : ''"
         v-for="(item, index) in options"
         :key="item.value + index"
       ></el-step>
@@ -21,7 +17,7 @@
 <script>
 export default {
   name: "statusBar",
-  props: ["options", "status"],
+  props: ["options", "status", "newTime"],
   /**
    * 属性集合
    * @param {Array}       options                 : 状态条数组        必填
@@ -35,7 +31,9 @@ export default {
     },
   },
   mounted() {
-    this.sIndex = this.options.findIndex((v) => v.value === this.status);
+    this.getList();
+    console.log(this.options);
+    console.log(this.status);
     console.log(this.sIndex);
   },
   data() {
@@ -43,7 +41,11 @@ export default {
       sIndex: 0,
     };
   },
-  methods: {},
+  methods: {
+    getList() {
+      this.sIndex = this.options.findIndex((v) => v.value === this.status);
+    },
+  },
 };
 </script>
 

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -8,8 +8,15 @@
         <span class="title">采购单编号：{{ queryId }}</span>
 
         <div class="fr">
-          <el-button type="primary"  :size="'mini'" class="fr" @click="diffAdd = true">填写总工差</el-button>
+          <el-button
+            type="primary"
+            :size="'mini'"
+            class="fr"
+            @click="diffAdd = true"
+            >填写总工差</el-button
+          >
         </div>
+
         <!-- <span class="fr">
           <el-tag>
             {{
@@ -19,7 +26,12 @@
           </el-tag>
         </span> -->
       </div>
-
+      <status-bar
+        v-if="newTime !== ''"
+        :newTime="newTime"
+        :options="statusOptions"
+        :status="status"
+      />
       <el-collapse v-model="activeNames">
         <el-collapse-item title="采购单信息" name="1">
           <purchase-order-addEdit
@@ -40,6 +52,15 @@
             @refresh="initData()"
           />
         </el-collapse-item>
+        <!--  -->
+        <el-collapse-item title="审批记录" name="10">
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'CGD'"
+            :orderCode="orderCode"
+          />
+        </el-collapse-item>
       </el-collapse>
       <diff-order-add
         :sitem="sitem"
@@ -87,10 +108,18 @@ export default {
   },
   data() {
     return {
-      isMetal:false,
+      isMetal: false,
       finishStatus: "finish",
-      activeNames: ["0", "1", "2", "3", "4", "5"],
+      activeNames: ["0", "1", "2", "3", "4", "5", "10"],
       sitem: null,
+      statusOptions: [
+        { value: "0", label: "发货意见" },
+        { value: "1", label: "填写发货单" },
+        { value: "2", label: "部分发货" },
+        { value: "3", label: "发货完成" },
+        // { value: "4", label: "发货中" },
+        // { value: "5", label: "已发货" },
+      ],
       statusList: [
         {
           code: "0",
@@ -114,6 +143,7 @@ export default {
       loading: false,
       queryId: "",
       diffAdd: false,
+      orderCode: "",
     };
   },
   mounted() {
@@ -139,9 +169,11 @@ export default {
       const res = await asyncRequest.detail({ cgdNo: this.queryId });
       if (res && res.code === 0 && res.data) {
         this.sitem = res.data;
-        const {status,can}=this.sitem
+        const { status, can } = this.sitem;
         this.status = status;
-        
+        console.log(res.data);
+        this.orderCode = res.data.cgdNo;
+        console.log(this.orderCode);
         this.getNewTime();
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();

src/views/purchaseIn/storeManage/detail.vue

@@ -3,6 +3,13 @@
     <div
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
+      {{ status }}
+      <status-bar
+        v-if="newTime !== '' && status !== '4'"
+        :newTime="newTime"
+        :options="statusOptions"
+        :status="status"
+      />
       <div class="tr" style="padding: 10px 0; height: 50px">
         <span class="fl" style="padding: 3px 0 0 3px">备货详情</span>
         <el-button
@@ -84,6 +91,15 @@
             </el-col>
           </el-row>
         </el-collapse-item>
+        <el-collapse-item title="审批记录" name="10">
+          <!-- v-if="newTime !== ''" -->
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'BHD'"
+            :orderCode="orderCode"
+          />
+        </el-collapse-item>
       </el-collapse>
     </div>
     <div v-else>
@@ -121,13 +137,21 @@ export default {
   },
   data() {
     return {
-      activeNames: ["0", "1", "2", "3", "4"],
+      orderCode: "",
+
+      activeNames: ["0", "1", "2", "3", "4", "10"],
       newTime: "",
       isDisabled: false,
       queryId: "",
       loading: true,
       sitem: null,
       status: "",
+      statusOptions: [
+        { value: "0", label: "取消" },
+        { value: "1", label: "发起" },
+        { value: "2", label: "采购意见反馈" },
+        { value: "3", label: "采购单生成" },
+      ],
     };
   },
   mounted() {
@@ -192,6 +216,9 @@ export default {
       if (res && res.code === 0 && res.data) {
         this.sitem = res.data;
         this.status = res.data.status;
+        // console.log(res.data.bk_code);
+        this.orderCode = res.data.bk_code;
+        // console.log(this.orderCode);
         this.getNewTime();
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
@@ -259,6 +286,7 @@ export default {
     },
     getNewTime() {
       this.newTime = new Date().valueOf();
+      console.log(this.orderCode);
     },
   },
 };

src/views/purchaseIn/storeManage/index.vue

@@ -51,7 +51,7 @@
                     clearable
                     :size="searchSize"
                     v-model="parmValue.status"
-                    placeholder="节点查询"
+                    placeholder="状态"
                     @change="searchList"
                   >
                     <el-option

src/views/purchaseIn/wsmInOrder/detail.vue

@@ -81,6 +81,14 @@
             @refresh="initData()"
           />
         </el-collapse-item>
+        <el-collapse-item title="审批记录" name="10">
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'XSQRD'"
+            :orderCode="orderCode"
+          />
+        </el-collapse-item>
       </el-collapse>
     </div>
     <div v-else>
@@ -123,9 +131,17 @@ export default {
   },
   data() {
     return {
-      activeNames: ["0", "1", "2", "3", "4", "5"],
+      activeNames: ["0", "1", "2", "3", "4", "5", "10"],
       sitem: null,
       status: "",
+      statusOptions: [
+        { value: "0", label: "取消" },
+        { value: "1", label: "发起" },
+        { value: "2", label: "反馈物流费" },
+        { value: "3", label: "同意下单" },
+        { value: "4", label: "发货中" },
+        { value: "5", label: "已发货" },
+      ],
       statusList: [
         {
           code: "0",

src/views/sellOut/goodsService/components/addEditForm.vue

@@ -243,6 +243,7 @@ export default {
         },
       ],
       expect_value: "", //期望意愿
+      code: "",
     };
   },
   computed: {
@@ -285,6 +286,8 @@ export default {
     },
     async initForm() {
       this.loading = true;
+      console.log(this.id);
+      console.log(this.sitem);
       if (this.id === "add") {
         this.status = "";
         this.rulesThis = this.rules;
@@ -335,21 +338,22 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-
-          let { bum } = this.sitem;
-          if (this.id === "add") {
-            let OutCode = "";
-            bum.map((ele) => {
-              OutCode = ele.outCode;
-            });
-            this.ruleForm = {
-              anomalous_numbers: "", //异常数量
-              anomalous_reason: "", //异常原因
-              expect_wish: "", //期望意愿
-              anomalous_images: [],
-              outCode: OutCode,
-            };
-          }
+          console.log(this.sitem);
+          let { outCode } = this.sitem;
+          this.code = outCode;
+          // if (this.id === "add") {
+          // let OutCode = "";
+          // bum.map((ele) => {
+          //   OutCode = ele.outCode;
+          // });
+          this.ruleForm = {
+            anomalous_numbers: "", //异常数量
+            anomalous_reason: "", //异常原因
+            expect_wish: "", //期望意愿
+            anomalous_images: [],
+            outCode: this.code,
+          };
+          // }
         }
       });
     },

src/views/sellOut/goodsService/components/returnExpress.vue

@@ -9,6 +9,7 @@
     style="width: 100%"
     class="demo-ruleForm"
   >
+    {{ returnCode }}
     <el-row>
       <el-col :span="12">
         <el-form-item label="费用承担方" prop="express_bear">
@@ -140,6 +141,7 @@ export default {
           label: "供应商承担",
         },
       ],
+      code: "",
       isShow: false,
       loading: false,
       status: "", //存储详情接口返的状态
@@ -152,7 +154,7 @@ export default {
         express_bear: "", //物流费用承担方
         express_company: [], //物流公司
         express_numbres: "", //物流单号
-        express_fee: "", //物流费用
+        express_fee: 0, //物流费用
         page: 1,
         size: 15,
       },
@@ -253,12 +255,13 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
+          this.code = this.returnCode;
           this.ruleForm = {
             express_bear: "",
             post_company: "", //入参快递公司
             express_company: [], //物流公司
             express_numbres: "", //物流单号
-            express_fee: "", //物流费用
+            express_fee: 0, //物流费用
             type: "",
             name: "",
           };
@@ -271,27 +274,22 @@ export default {
           console.log(this.ruleForm);
           let model = JSON.parse(JSON.stringify(this.ruleForm));
           let _model = {
-            returnCode: this.returnCode, //退货单号
+            returnCode: this.code, //退货单号
             own: model.express_bear, //费用承担方
             company: model.post_company, //快递公司
             post_code: model.express_numbres, //快递编号
-            post_fee: model.express_fee, //快递费用
+            post_fee: model.express_fee || 0, //快递费用
           };
-          const res = (res = await asyncRequest.afterPost(_model));
+          const res = await asyncRequest.afterPost(_model);
           this.loading = false;
           if (res && res.code === 0) {
             // const title = this.id === "add" ? "添加成功！" : "修改成功！";
             this.$notify.success({
-              title: "物流已上传",
+              title: res.message,
               message: "",
             });
-
-            // if (this.id === "add") {
-            //   this.showModelThis = false;
-            //   this.$emit("refresh", false);
-            // } else {
-            //   this.initForm();
-            // }
+            console.log("抛出事件");
+            this.$emit("refresh");
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {

src/views/sellOut/goodsService/index.vue

@@ -249,7 +249,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="routeGoto('serviceDetail', { id: scope.row })"
+              @click="routeGoto('serviceDetail', { id: scope.row.returnCode })"
             ></i>
           </el-tooltip>
         </template>

src/views/sellOut/goodsService/serviceDetail.vue

@@ -5,14 +5,21 @@
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
       <p>{{ powers }}</p>
-      <p>status{{ status }}</p>
-      <!-- <div class="detail-page-title">
-        <span class="title">售后申请详情</span>
-        <add-edit-form :sitem="sitem"></add-edit-form>
-      </div> -->
+      <p>status{{ s_status }}</p>
+      {{ newTime }}
+      <status-bar
+        v-if="newTime !== ''"
+        :newTime="newTime"
+        :options="statusOptions"
+        :status="s_status"
+      />
       <el-collapse v-model="activeNames">
         <el-collapse-item title="售后申请详情" name="1">
-          <add-edit-form :sitem="sitem"></add-edit-form>
+          <add-edit-form
+            :sitem="sitem"
+            :newTime="newTime"
+            v-if="newTime != ''"
+          ></add-edit-form>
         </el-collapse-item>
         <el-collapse-item
           title="业务审核"
@@ -52,12 +59,23 @@
           name="4"
           v-if="powers.some((item) => item == '040')"
         >
+          {{ s_status }}
           <return-express
-            :returnCode="returnCode"
-            v-if="status == '3'"
+            @refresh="searchList"
+            :returnCode="orderCode"
+            v-if="s_status == '3'"
           ></return-express>
         </el-collapse-item>
+        <el-collapse-item title="审批记录" name="10">
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'SHD'"
+            :orderCode="orderCode"
+          />
+        </el-collapse-item>
       </el-collapse>
+      {{ orderCode }}
     </div>
     <div v-else>
       <no-auth></no-auth>
@@ -99,20 +117,28 @@ export default {
   },
   data() {
     return {
-      returnCode: "",
-      activeNames: ["0", "1", "2", "3", "4"],
-      sitem: null,
-      status: "", //存储详情接口状态
+      activeNames: ["0", "1", "2", "3", "4", "10"],
+      s_status: "", //存储详情接口状态
       statusList: [],
       sitem: null,
       newTime: "",
       loading: false,
+      statusOptions: [
+        { value: "0", label: "业务审核" },
+        { value: "1", label: "物流信息反馈" },
+        // { value: "2", label: "反馈物流费" },
+        { value: "3", label: "填写退货信息" },
+        { value: "4", label: "已退货" },
+        // { value: "5", label: "已发货" },
+      ],
+      orderCode: "",
+      return_code: "",
+      code: "",
     };
   },
   mounted() {
-    this.sitem = this.$route.query.id;
-    console.log(this.sitem);
-    this.returnCode = this.sitem.returnCode;
+    this.code = this.$route.query.id;
+
     this.searchList();
   },
   methods: {
@@ -136,58 +162,50 @@ export default {
         type: "warning",
       })
         .then(async () => {
-          if (this.sitem) {
-            let { returnCode } = this.sitem;
-            const model = {
-              remark,
-              returnCode,
-              status: type,
-            };
-            let res = await asyncRequest.status(model);
+          // if (this.sitem) {
+          // let { returnCode } = this.sitem;
+          const model = {
+            remark,
+            returnCode: this.code,
+            status: type,
+          };
+          let res = await asyncRequest.status(model);
 
-            if (res && res.code === 0) {
-              this.$notify.success({
-                title: "修改成功！",
-                message: "",
-              });
-              await this.searchList();
-            } else if (res && res.code >= 100 && res.code <= 104) {
-              await this.logout();
-            } else {
-              this.$message.warning(res.message);
-            }
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "修改成功！",
+              message: "",
+            });
+            await this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
           }
+          // }
         })
         .catch(() => {
           console.log("取消");
         });
     },
     async searchList() {
-      console.log(this.sitem);
-      if (this.sitem) {
-        let { returnCode } = this.sitem;
-        let model = {
-          returnCode,
-        };
-        const res = await asyncRequest.detail(model);
-        if (res && res.code === 0 && res.data) {
-          this.status = res.data.status;
-          // let { error_num, error_img, error_remark, except_code, error_code } =
-          //   res.data;
-          // console.log(res.data);
-          // this.ruleForm = {
-          //   stock_out_numbers: "", //出库单编号
-          //   anomalous_numbers: error_num, //异常数量
-          //   anomalous_reason: error_code, //异常原因
-          //   expect_wish: except_code, //期望意愿
-          //   anomalous_images: [error_img],
-          //   anomalous_remark: error_remark, //异常备注
-          // };
-        } else if (res && res.code >= 100 && res.code <= 104) {
-          await this.logout();
-        } else {
-          this.$message.warning(res.message);
-        }
+      let model = {
+        returnCode: this.code,
+      };
+      const res = await asyncRequest.detail(model);
+      if (res && res.code === 0 && res.data) {
+        this.s_status = res.data.status;
+        console.log(this.s_status);
+        console.log(res.data);
+        this.sitem = res.data;
+        console.log(this.sitem);
+        this.orderCode = res.data.returnCode;
+        // console.log(this.orderCode);
+        this.getNewTime();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
       }
     },
   },

src/views/sellOut/returnOrder/columns.js

@@ -25,10 +25,10 @@ export default [
           width:"160"
 
         },
-        {
-          prop: "return_wsm",   
-          label: "收货仓库",
-        },
+        // {
+        //   prop: "return_wsm",   
+        //   label: "收货仓库",
+        // },
         {
           prop: "return_num",
           label: "退货数量",
@@ -41,18 +41,18 @@ export default [
             prop:"received_num",
             label:"收货数量",
         },
-        {
-          prop: "contactor",
-          label: "收货人",
-        },
-        {
-          prop: "mobile",
-          label: "联系电话",
-        },
-        {
-          prop: "addr",
-          label: "收货人地址",
-        },
+        // {
+        //   prop: "contactor",
+        //   label: "收货人",
+        // },
+        // {
+        //   prop: "mobile",
+        //   label: "联系电话",
+        // },
+        // {
+        //   prop: "addr",
+        //   label: "收货人地址",
+        // },
         // {地址code}
         {
           prop: "post_fee",

src/views/sellOut/returnOrder/components/return-record.vue

@@ -9,11 +9,12 @@
     style="width: 100%"
     class="demo-ruleForm"
   >
-    <p>sitem{{ sitem }}</p>
+    <p>sitem:{{ status }}</p>
     <el-row>
       <el-col :span="12">
         <el-form-item label="收货总数量" prop="get_goods_numbers">
           <el-input
+            :disabled="status != '1' && status != '0'"
             v-model="ruleForm.get_goods_numbers"
             placeholder="收货总数量"
           ></el-input>
@@ -22,6 +23,7 @@
       <el-col :span="12">
         <el-form-item label="可销售数量" prop="can_sell_numbers">
           <el-input
+            :disabled="status != '1' && status != '0'"
             v-model="ruleForm.can_sell_numbers"
             placeholder="可销售数量"
           ></el-input>
@@ -30,6 +32,7 @@
       <el-col :span="12">
         <el-form-item label="其他备注" prop="remark">
           <el-input
+            :disabled="status != '1' && status != '0'"
             type="textarea"
             maxlength="250"
             show-word-limit
@@ -141,13 +144,17 @@
                         placement="top"
                       >
                         <i
+                          v-if="status == '1' || status == '0'"
                           class="el-icon-circle-plus-outline tb-icon"
                           style="color: #63cbe7"
                           @click="openModal('add', '028')"
                         ></i>
                       </el-tooltip>
                     </template>
-                    <template slot-scope="scope">
+                    <template
+                      slot-scope="scope"
+                      v-if="status == '1' || status == '0'"
+                    >
                       <el-tooltip
                         effect="dark"
                         content="编辑"
@@ -193,7 +200,12 @@
 
     <el-row>
       <el-col :span="24" style="text-align: right; margin: 10px 0 20px 0">
-        <el-button type="primary" class="fr" :size="'mini'" @click="submitForm"
+        <el-button
+          v-if="status == '0' || status == '1'"
+          type="primary"
+          class="fr"
+          :size="'mini'"
+          @click="submitForm"
           >保 存
         </el-button>
         <el-button
@@ -259,6 +271,7 @@ export default {
       }
     };
     return {
+      arr: [],
       sitemGetNumber: "", //详情总收货量
       isShow: false, //用于情况1
       returnNO: "", //退货编号
@@ -275,10 +288,6 @@ export default {
       btn_code: "",
       modelId: "",
       options: [],
-      status: "",
-      tableForm: {
-        product_go: [],
-      },
       voList: [],
       edit: false, //默认不能提交
       totalNumber: 0, //全局保存数量
@@ -357,20 +366,33 @@ export default {
     },
 
     async resetForm() {
-      this.resign_name = "";
-      this.hand_name = "";
-      this.status = "";
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
+          this.status = "";
+          this.arr = [];
           console.log(this.sitem);
+          let { child, status, received_num, normal_num, remark } = this.sitem;
+          this.status = status;
+          console.log(child);
+          child.forEach((ele) => {
+            let obj = {
+              anomalous_numbers: ele.error_num,
+              anomalous_reason_code: ele.error_code,
+              anomalous_remark: ele.error_remark,
+              id: ele.id,
+            };
+            // console.log("1");
+            this.arr.push(obj);
+          });
+          console.log(this.arr);
           this.ruleForm = {
-            get_goods_numbers: "", //收货总数量
-            can_sell_numbers: "", //可销售数量
-            remark: "50", //其他备注
-            product_go: [], //表格参数
+            get_goods_numbers: received_num, //收货总数量
+            can_sell_numbers: normal_num, //可销售数量
+            remark: remark, //其他备注
+            product_go: this.arr, //表格参数this.arr
           };
         }
       });
@@ -381,16 +403,16 @@ export default {
         if (valid) {
           this.loading = true;
           let model = JSON.parse(JSON.stringify(this.ruleForm));
-          console.log(model);
           let thNo = "";
           if (this.sitem) {
             thNo = this.sitem.thNo;
           }
           let arr = [];
-          model.product_go.map((ele) => {
+          console.log(this.arr);
+          this.arr.map((ele) => {
             let obj = {
               error_num: ele.anomalous_numbers,
-              error_code: ele.anomalous_reason,
+              error_code: ele.anomalous_reason_code,
               error_remark: ele.anomalous_remark,
             };
             arr.push(obj);
@@ -402,11 +424,12 @@ export default {
             remark: model.remark, //
             errorlist: arr, //
           };
-
+          console.log(_model);
+          // return;
           const { get_goods_numbers, can_sell_numbers } = this.ruleForm;
           // 判断收获总数量是否等于可销售数量(情况1:没有异常数量)
           if (Number(get_goods_numbers) === Number(can_sell_numbers)) {
-            const res = await asyncRequest.returnCheck(_model);
+            const res = await asyncRequest.returnCheck({}); //_model
             if (res && res.code === 0) {
               console.log("submit");
               this.$notify.success({
@@ -414,6 +437,7 @@ export default {
                 message: "",
               });
               this.$emit("refresh");
+              console.log("抛出事件给详情页");
             } else if (res && res.code >= 100 && res.code <= 104) {
               await this.logout();
             } else {
@@ -441,12 +465,12 @@ export default {
                   title: res.message,
                   message: "",
                 });
+                this.$emit("refresh");
               } else if (res && res.code >= 100 && res.code <= 104) {
                 await this.logout();
               } else {
                 this.$message.warning(res.message);
               }
-              console.log("submit");
             } else {
               this.$message.warning("异常数量不正确或者当前表格在编辑！");
             }
@@ -491,6 +515,7 @@ export default {
         }
       });
     },
+    // 获取异常原因下拉列表
     async getresultlist() {
       const res = await asyncRequest.resultlist({
         page: 1,

src/views/sellOut/returnOrder/components/returnCheck.vue

@@ -9,7 +9,7 @@
         class="demo-tableForm product_go"
       >
         <!-- {{ tableForm.product_go }} -->
-        <p>{{ sitem }}</p>
+        <!-- <p>{{ sitem }}</p> -->
         <el-form-item label="入库情况">
           <el-table
             :data="tableForm.product_go"
@@ -138,7 +138,11 @@
           </el-col> -->
 
           <el-col :span="24" style="text-align: right; padding: 30px 0 10px 0">
-            <el-button type="primary" :size="'mini'" @click="submitForm"
+            <el-button
+              v-if="status == '2'"
+              type="primary"
+              :size="'mini'"
+              @click="submitForm"
               >保 存
             </el-button>
           </el-col>
@@ -175,11 +179,15 @@ export default {
       thNo: "",
       options: [
         {
-          value: "agree",
+          value: "0",
+          label: "待审核",
+        },
+        {
+          value: "1",
           label: "同意",
         },
         {
-          value: "refuse",
+          value: "2",
           label: "拒绝",
         },
       ],
@@ -189,16 +197,7 @@ export default {
         product_go: [],
       },
       tableFormThis: config.tableFormThis,
-      voList: [
-        {
-          // check_remark: "", //
-          // check_value: "agree",
-          // anomalous_numbers: 99,
-          // anomalous_reason: "不喜欢",
-          // anomalous_reason_code: "", //异常原因code
-          // anomalous_remark: "111",
-        },
-      ],
+      voList: [],
     };
   },
   watch: {
@@ -216,7 +215,10 @@ export default {
     async initForm() {
       this.loading = true;
       this.columns = [];
-      console.log(this.sitem);
+      // console.log(this.newTime);
+      // console.log(this.sitem);
+      // console.log(this.sitem);
+      // console.log(this.sitem);
       // await this.getresultlist();
       // this.thNo = this.sitem.thNo;
       // console.log(this.thNo);
@@ -232,6 +234,24 @@ export default {
           console.log(this.sitem);
           // console.log(this.sitem);
 
+          let { child, thNo, status } = this.sitem;
+          this.status = status;
+          this.thNo = thNo;
+          console.log(child);
+
+          child.map((ele) => {
+            let obj = {
+              id: ele.id,
+              anomalous_numbers: ele.error_num,
+              anomalous_reason: ele.error_code,
+              anomalous_reason_code: ele.error_code, //异常原因code
+              anomalous_remark: ele.error_remark,
+              check_value: ele.status,
+              check_remark: ele.error_remark,
+            };
+            this.voList.push(obj);
+          });
+          // console.log(this.voList);
           let list = JSON.parse(JSON.stringify(this.voList));
           list.forEach((v) => {
             v.edit = false;
@@ -255,18 +275,19 @@ export default {
       console.log(this.tableForm);
       let arr = [];
       let model = JSON.parse(JSON.stringify(this.tableForm));
+      console.log(model.product_go);
       model.product_go.map((ele) => {
         let obj = {
-          id: "",
+          id: ele.id,
           remark: ele.anomalous_remark,
-          status: "",
+          status: ele.check_value,
         };
         arr.push(obj);
       });
       let _model = {
         thNo: this.thNo,
         errorlist: arr,
-        status: "",
+        status:'3', //1待验货2待验货审核3待业务审核4完成 this.status + 1
       };
       console.log(_model);
       const res = await asyncRequest.check(_model);
@@ -276,7 +297,8 @@ export default {
           title: res.message,
           message: "",
         });
-        // this.$emit("refresh");
+        this.$emit("refresh");
+        console.log("退货验收审核成功");
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {

src/views/sellOut/returnOrder/detail.vue

@@ -7,19 +7,30 @@
       <p>sellReturnDetail页面{{ powers }}</p>
       <p>status{{ status }}</p>
       <p>{{ newTime }}</p>
+      <status-bar
+        v-if="newTime !== ''"
+        :newTime="newTime"
+        :options="statusOptions"
+        :status="status"
+      />
       <el-collapse v-model="activeNames">
         <el-collapse-item title="退货验收记录" name="0">
           <!-- <add-edit-form :sitem="sitem"></add-edit-form> -->
-          <return-record :sitem="s_sitem" @refresh="searchList"></return-record>
+          <return-record
+            :sitem="s_sitem"
+            @refresh="initData"
+            :newTime="newTime"
+          ></return-record>
         </el-collapse-item>
 
         <el-collapse-item title="退货验收审核" name="1">
           <!-- <return-check :sitem="sitem"></return-check> -->
           <!--  -->
           <return-check
-            v-if="newTime != ''"
+            v-if="newTime != '' && status == '2'"
+            :newTime="newTime"
             :sitem="s_sitem"
-            @refresh="searchList"
+            @refresh="initData"
           ></return-check>
         </el-collapse-item>
         <el-collapse-item
@@ -27,7 +38,9 @@
           name="2"
           v-if="powers.some((item) => item == '001')"
         >
+          {{ status }}
           <exam-form
+            v-if="status == '3'"
             :statusList="statusList"
             :newTime="newTime"
             :disabled="false"
@@ -35,6 +48,14 @@
             @searchChange="examForm"
           />
         </el-collapse-item>
+        <el-collapse-item title="审批记录" name="10">
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'SHD'"
+            :orderCode="orderCode"
+          />
+        </el-collapse-item>
       </el-collapse>
     </div>
     <div v-else>
@@ -72,10 +93,25 @@ export default {
   },
   data() {
     return {
+      statusOptions: [
+        { value: "0", label: "取消" },
+        { value: "1", label: "退货商品验收" },
+        // { value: "2", label: "反馈物流费" },
+        { value: "2", label: "退货验收审核" },
+        { value: "3", label: "退货业务审核" },
+
+        { value: "4", label: "退货完成" },
+
+        // { id: "0", label: "待申请" },
+        // { id: "1", label: "待验收" },
+        // { id: "2", label: "待验收审核" },
+        // { id: "3", label: "待业务审核" },
+        // { id: "4", label: "完成退货" },
+      ],
       s_sitem: null, //传给组件
       // --
-      returnCode: "",
-      activeNames: ["0", "1", "2"],
+      orderCode: "",
+      activeNames: ["0", "1", "2", "10"],
       sitem: null,
       status: "", //存储详情接口状态
       statusList: [
@@ -94,13 +130,13 @@ export default {
       ],
       newTime: "",
       loading: false,
+      qid: "",
     };
   },
   mounted() {
-    this.sitem = this.$route.query.id;
-    console.log(this.sitem);
-    this.searchList();
-    this.getNewTime();
+    this.qid = this.$route.query.id;
+    // console.log(this.sitem);
+    this.initData();
   },
   methods: {
     getNewTime() {
@@ -110,62 +146,69 @@ export default {
     async examForm(e) {
       console.log(e);
       if (!this.loading) {
-        let type = e.state === "1" ? "1" : "0";
+        let type = e.state === "1" ? "4" : e.rebut;
         console.log(type);
         await this.setstatus(type, "提交业务审核", e.remark);
       }
     },
     //
     async setstatus(type, detail, remark) {
-      await this.$confirm(`确定要${type === "1" ? "同意" : "驳回"}？`, {
+      await this.$confirm(`确定要${type === "4" ? "同意" : "驳回"}？`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(async () => {
-          if (this.sitem) {
-            let { returnCode } = this.sitem;
-            const model = {
-              remark,
-              returnCode,
-              status: type,
-            };
-            let res = await asyncRequest.status(model);
-
-            if (res && res.code === 0) {
-              this.$notify.success({
-                title: "修改成功！",
-                message: "",
-              });
-              await this.searchList();
-            } else if (res && res.code >= 100 && res.code <= 104) {
-              await this.logout();
-            } else {
-              this.$message.warning(res.message);
-            }
+          console.log(type);
+          console.log(remark);
+          // let { returnCode } = this.sitem;
+          // const model = {
+          //   remark,
+          //   returnCode,
+          //   status: type,
+          // };
+          let _model = {
+            thNo: this.qid,
+            status: type,
+            remark: remark,
+          };
+          let res = await asyncRequest.status(_model);
+          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 {
+            this.$message.warning(res.message);
           }
         })
         .catch(() => {
           console.log("取消");
         });
     },
-    async searchList() {
-      console.log(this.sitem);
-      if (this.sitem) {
-        let { thNo } = this.sitem;
-        let model = {
-          thNo,
-        };
-        const res = await asyncRequest.detail(model);
-        if (res && res.code === 0 && res.data) {
-          this.status = res.data.status;
-          this.s_sitem = res.data;
-        } else if (res && res.code >= 100 && res.code <= 104) {
-          await this.logout();
-        } else {
-          this.$message.warning(res.message);
-        }
+    async initData() {
+      // console.log(this.sitem);
+      // if (this.sitem) {
+      // let { thNo } = this.sitem;
+      let model = {
+        thNo: this.qid,
+      };
+      const res = await asyncRequest.detail(model);
+      if (res && res.code === 0 && res.data) {
+        this.status = res.data.status;
+        this.s_sitem = res.data;
+        console.log(res.data);
+        this.orderCode =res.data.orderCode;
+        this.getNewTime();
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(res.message);
       }
+      // }
     },
   },
 };

src/views/sellOut/returnOrder/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="sellReturnList pagePadding">
+  <div class="returnOrder pagePadding">
     <div
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
@@ -225,7 +225,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="routeGoto('sellReturnDetail', { id: scope.row })"
+              @click="routeGoto('sellReturnDetail', { id: scope.row.thNo })"
             ></i>
             <!-- @click="openModal(scope.row.id, true, scope.row)" -->
           </el-tooltip>
@@ -292,7 +292,7 @@ import addEdit from "./addEdit";
 import { mapGetters } from "vuex";
 
 export default {
-  name: "sellReturnList",
+  name: "returnOrder",
   mixins: [mixinPage, resToken],
   components: {
     addEdit,
@@ -302,7 +302,7 @@ export default {
     powers() {
       let tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "sellReturnList"
+          (item) => item.menu_route == "returnOrder"
         ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
@@ -341,8 +341,8 @@ export default {
         serviceNumber: "", //售后申请编号
         postCompany: "", //物流公司
         postNumber: "", //物流单号
-        startTime: "", //
-        endTime: "", //
+        start: "", //
+        end: "", //
         status: "", //状态节点
         clientNumber: "", //退货客户编号
         // --
@@ -384,8 +384,8 @@ export default {
         serviceNumber: "", //售后申请编号
         postCompany: "", //物流公司
         postNumber: "", //物流单号
-        startTime: "", //
-        endTime: "", //
+        start: "", //
+        end: "", //
         status: "", //状态节点
 
         // --
@@ -507,6 +507,20 @@ export default {
       console.log(this.parmValue.postCompany);
       await this.searchList();
     },
+    // 时间
+    async handleTime(e) {
+      if (e.startTime !== "") {
+        this.parmValue.start = e.startTime;
+      } else {
+        this.parmValue.start = "";
+      }
+      if (e.endTime !== "") {
+        this.parmValue.end = e.endTime;
+      } else {
+        this.parmValue.end = "";
+      }
+      // await this.handleClick(this.sselect);
+    },
   },
 };
 </script>

src/views/sellOut/salesOrder/detail.vue

@@ -7,7 +7,7 @@
       <div class="tl" style="padding: 10px 0 50px 0">
         <!-- <span> {{ status }}----{{ powers }}</span> -->
 
-        <el-button
+        <!-- <el-button
           style="margin: 0 0 0 10px"
           class="fr"
           type="primary"
@@ -15,7 +15,7 @@
           :size="'mini'"
           @click="openModal('add', false, 'sell')"
           >新建销售退货单
-        </el-button>
+        </el-button> -->
 
         <el-button
           class="fr"

src/views/sellOut/sellReturnList/columns.js

@@ -1,7 +1,7 @@
 export default [
         {
           prop: "orderCode",
-          label: "订单编号",
+          label: "采购单编号",
           width:"160"
         },
         {
@@ -15,76 +15,76 @@ export default [
 
         {
           prop: "outCode",
-          label: "出库单编号",
+          label: "退货仓库编号",
           width:"160"
 
         },
         {
           prop: "returnCode",
-          label: "售后单编号",
+          label: "退货仓库名称",
           width:"160"
 
         },
         {
           prop: "return_wsm",   
-          label: "收货仓库",
+          label: "退货公司",
         },
         {
           prop: "return_num",
-          label: "退货数量",
+          label: "退货公司编号",
         },
         {
             prop:"normal_num",
-            label:"正常数量",
+            label:"申请人",
         },
         {
             prop:"received_num",
-            label:"收货数量",
+            label:"申请时间",
         },
         {
           prop: "contactor",
-          label: "收货人",
+          label: "退货数量",
         },
         {
           prop: "mobile",
-          label: "联系电话",
+          label: "商品单价",
         },
         {
           prop: "addr",
-          label: "收货人地址",
+          label: "退货总金额",
         },
         // {地址code}
-        {
-          prop: "post_fee",
-          label: "邮费",
-        },
-        {
-          prop: "post_code",
-          label: "快递单号",
-          width:"160"
-        },
-         {
-          prop: "post_company",
-          label: "物流公司",
-        },
-        {
-            prop:"remark",
-            label:"备注",
-        },
-        {
-          prop: "return_code",
-          label: "退货原因",
-        },
-        {
-            prop:"good_code",
-            label:"商品属性编号",
-            width:"150"
-        },
-        {
-            prop:"good_name",
-            label:"商品名称",
-            width:"150"
-        },
+        // {
+        //   prop: "post_fee",
+        //   label: "邮费",
+        // },
+        // {
+        //   prop: "post_code",
+        //   label: "快递单号",
+        //   width:"160"
+        // },
+        //  {
+        //   prop: "post_company",
+        //   label: "物流公司",
+        // },
+        // {
+        //     prop:"remark",
+        //     label:"备注",
+        // },
+        // {
+        //   prop: "return_code",
+        //   label: "退货原因",
+        // },
+        // {
+        //     prop:"good_code",
+        //     label:"商品属性编号",
+        //     width:"150"
+        // },
+        // {
+        //     prop:"good_name",
+        //     label:"商品名称",
+        //     width:"150"
+        // },
         {
           prop: "status",
           label: "状态",

src/views/sellOut/sellReturnList/index.vue

@@ -29,18 +29,18 @@
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
               <el-col :span="24">
-                <!-- 销售订单编号 -->
+                <!-- 采购单编号 -->
                 <el-col :span="4" style="width: 220px; padding: 0 0 0 0px">
                   <el-input
                     clearable
                     :size="searchSize"
-                    v-model="parmValue.sellOrderNumber"
+                    v-model="parmValue.CG_numbers"
                     :maxlength="40"
-                    placeholder="订单编号"
+                    placeholder="采购单编号"
                     @blur="searchList"
                   />
                 </el-col>
-                <!-- 退货编号 -->
+                <!-- 退货单编号 -->
                 <el-col :span="4" style="width: 220px; padding: 0 0 0 10px">
                   <el-input
                     clearable
@@ -51,14 +51,14 @@
                     @blur="searchList"
                   />
                 </el-col>
-                <!-- 销售出库编号 -->
+                <!-- 退货仓库编号 -->
                 <el-col :span="4" style="width: 220px; padding: 0 0 0 10px">
                   <el-input
                     clearable
                     :size="searchSize"
-                    v-model="parmValue.sellOutNumber"
+                    v-model="parmValue.returnStoreNum"
                     :maxlength="40"
-                    placeholder="出库单编号"
+                    placeholder="退货仓库编号"
                     @blur="searchList"
                   />
                 </el-col>
@@ -91,25 +91,25 @@
               </el-col>
             </el-row>
             <el-row style="padding: 10px 0 0 0">
-              <!-- 售后申请编号 -->
+              <!-- 退货仓库公司编号 -->
               <el-col :span="4" style="width: 200px; padding: 0 0 0 0px">
                 <el-input
                   clearable
                   :size="searchSize"
-                  v-model="parmValue.serviceNumber"
+                  v-model="parmValue.returnCompanyNum"
                   :maxlength="40"
-                  placeholder="售后单编号"
+                  placeholder="退货公司编号"
                   @blur="searchList"
                 />
               </el-col>
-              <!-- 退回客户编号 -->
+              <!-- 申请人 -->
               <el-col :span="4" style="width: 200px; padding: 0 0 0 10px">
                 <el-input
                   clearable
                   :size="searchSize"
-                  v-model="parmValue.clientNumber"
+                  v-model="parmValue.applyer"
                   :maxlength="40"
-                  placeholder="客户编号"
+                  placeholder="申请人"
                   @blur="searchList"
                 />
               </el-col>
@@ -125,73 +125,6 @@
                 />
               </el-col>
             </el-row>
-
-            <el-row style="padding: 10px 0 0 0">
-              <!-- 快递公司 -->
-              <el-col :span="4" style="width: 180px; padding: 0 0 0 0px">
-                <search-express
-                  :size="searchSize"
-                  :value="parmValue.parmValue"
-                  :placeholder="'物流公司'"
-                  :names="''"
-                  :is-detail="false"
-                  @searchChange="handleCompany"
-                />
-              </el-col>
-              <!-- 快递单号 -->
-              <el-col :span="4" style="width: 200px; padding: 0 0 0 10px">
-                <el-input
-                  clearable
-                  :size="searchSize"
-                  v-model="parmValue.postNumber"
-                  :maxlength="40"
-                  placeholder="快递单号"
-                  @blur="searchList"
-                />
-              </el-col>
-
-              <!-- 节点查询 -->
-              <el-col :span="4" style="width: 150px; padding: 0 0 0 10px">
-                <el-select
-                  :size="searchSize"
-                  v-model="parmValue.status"
-                  filterable
-                  clearable
-                  placeholder="节点"
-                  style="width: 100%"
-                  @change="
-                    pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();
-                  "
-                >
-                  <el-option
-                    v-for="item in statusList"
-                    :key="'status' + item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-col>
-              <el-col :span="4" style="width: 54px">
-                <el-button
-                  :size="searchSize"
-                  type="primary"
-                  class="fr"
-                  icon="el-icon-search"
-                  @click="searchList"
-              /></el-col>
-              <el-col :span="4" style="width: 66px">
-                <el-button
-                  type="warning"
-                  class="fr"
-                  :size="searchSize"
-                  @click="restSearch"
-                >
-                  重置
-                </el-button>
-              </el-col>
-            </el-row>
           </div>
         </template>
         <template #status="{ scope }">
@@ -331,16 +264,15 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
-        sellOrderNumber: "", //销售订单编号
-        returnNumber: "", //退货编号
-        sellOutNumber: "", //销售出库编号
-        serviceNumber: "", //售后申请编号
-        postCompany: "", //物流公司
-        postNumber: "", //物流单号
-        startTime: "", //
-        endTime: "", //
-        status: "", //状态节点
-        clientNumber: "", //退货客户编号
+        CG_numbers: "", //采购单号
+        returnNumber: "", //退货单编号
+        returnStoreNum: "", //退货仓库编号
+        returnCompanyNum: "", //退货公司编号
+        applyer: "", //申请人
+        start: "",
+        end: "",
+        status: "", //节点状态
+
         // --
         page: 1, // 页码
         size: 15, // 每页显示条数
@@ -374,19 +306,14 @@ export default {
   methods: {
     restSearch() {
       this.parmValue = {
-        sellOrderNumber: "", //销售订单编号
-        returnNumber: "", //退货编号
-        sellOutNumber: "", //销售出库编号
-        serviceNumber: "", //售后申请编号
-        postCompany: "", //物流公司
-        postNumber: "", //物流单号
-        startTime: "", //
-        endTime: "", //
-        status: "", //状态节点
-
-        // --
-        page: 1, // 页码
-        size: 15, // 每页显示条数
+        CG_numbers: "", //采购单号
+        returnNumber: "", //退货单编号
+        returnStoreNum: "", //退货仓库编号
+        returnCompanyNum: "", //退货公司编号
+        applyer: "", //申请人
+        start: "",
+        end: "",
+        status: "", //节点状态
         page: 1, // 页码
         size: 15, // 每页显示条数
       };

src/views/stock/allot/detail.vue

@@ -4,7 +4,8 @@
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <div class="tr" style="padding: 10px 0">
+      {{ status }}
+      <div class="tr" style="padding: 10px 0 30px 0">
         <el-button
           type="primary"
           plain
@@ -34,6 +35,12 @@
           >作废该条信息</el-button
         >
       </div>
+      <status-bar
+        v-if="newTime !== ''"
+        :newTime="newTime"
+        :options="statusOptions"
+        :status="status"
+      />
       <el-collapse v-model="activeNames" @change="handleChange">
         <el-collapse-item title="调拨详情" name="0">
           <add-form
@@ -81,11 +88,7 @@
             @refresh="initData()"
           />
         </el-collapse-item>
-        <el-collapse-item
-          title="入库方验货审核"
-          name="4"
-          v-if="status == '4' "
-        >
+        <el-collapse-item title="入库方验货审核" name="4" v-if="status == '4'">
           <inspection-table
             :newTime="newTime"
             :sitem="sitem"
@@ -94,6 +97,14 @@
             @refresh="initData()"
           />
         </el-collapse-item>
+        <el-collapse-item title="审批记录" name="10">
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'DBD'"
+            :orderCode="code"
+          />
+        </el-collapse-item>
       </el-collapse>
     </div>
     <div v-else>
@@ -135,12 +146,21 @@ export default {
   },
   data() {
     return {
-      activeNames: ["0", "1", "2", "3", "4", "5"],
+      code: "",
+      activeNames: ["0", "1", "2", "3", "4", "5", "10"],
       sitem: null,
       status: "",
       newTime: "",
       loading: false,
       queryId: "",
+      statusOptions: [
+        { value: "0", label: "发起" },
+        { value: "1", label: "入库方审核" },
+        { value: "2", label: "出库方发货" },
+        { value: "3", label: "入库方验货" },
+        { value: "4", label: "验货审核" },
+        { value: "5", label: "调拨完成" },
+      ],
     };
   },
   mounted() {
@@ -222,7 +242,8 @@ export default {
       if (res && res.code === 0 && res.data) {
         this.sitem = res.data;
         this.status = this.sitem.status;
-
+        // console.log(res.data);
+        this.code = res.data.allot_code;
         //;
         this.getNewTime();
       } else if (res && res.code >= 100 && res.code <= 104) {

src/views/stock/check/detail.vue

@@ -4,7 +4,8 @@
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <div class="tr" style="padding: 10px 0; height: 50px">
+      {{ status }}
+      <div class="tr" style="padding: 10px 0 50px 0; height: 50px">
         <span class="fl" style="padding: 3px 0 0 3px">盘点详情</span>
         <el-button
           type="primary"
@@ -41,7 +42,13 @@
           >作废该条信息</el-button
         >
       </div>
-
+      <!-- {{ newTime !== "" }} -->
+      <status-bar
+        v-if="newTime !== ''"
+        :newTime="newTime"
+        :options="statusOptions"
+        :status="status"
+      />
       <add-edit
         :newTime="newTime"
         v-if="newTime !== ''"
@@ -87,6 +94,14 @@
             @searchChange="examForm"
           />
         </el-collapse-item>
+        <el-collapse-item title="审批记录" name="10">
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'PDD'"
+            :orderCode="code"
+          />
+        </el-collapse-item>
       </el-collapse>
     </div>
     <div v-else>
@@ -126,7 +141,17 @@ export default {
   },
   data() {
     return {
-      activeNames: ["0", "1", "2", "3", "4"],
+      code: "",
+      statusOptions: [
+        { value: "0", label: "发起" },
+        { value: "1", label: "上传盘点结果" },
+        { value: "2", label: "审核判断结果" },
+        { value: "3", label: "系统更新" },
+        { value: "4", label: "盘点完成 " },
+        // { value: "5", label: "已发货" },
+      ],
+
+      activeNames: ["0", "1", "2", "3", "4", "10"],
       sitem: null,
       status: "",
       newTime: "",
@@ -148,6 +173,8 @@ export default {
       if (res && res.code === 0 && res.data) {
         this.sitem = res.data;
         this.status = this.sitem.status;
+        console.log(res.data);
+        this.code = res.data.check_code;
         // this.activeNames = [this.status];
         this.getNewTime();
       } else if (res && res.code >= 100 && res.code <= 104) {