Merge branch 'sit'

src/components/globalComponents/digital-input/main.vue

@@ -62,7 +62,6 @@ export default {
     return {
       num: 0,
       loading: false,
-      // imgAPI: urlConfig.baseURL,
     };
   },
   methods: {

src/components/globalComponents/show-goods-data-table/main.vue

@@ -137,7 +137,7 @@
       "
       :sitem="sitem"
       :columns="costColumns"
-       :border="border"
+      :border="border"
     >
       <template slot="good_name">
         <img
@@ -183,7 +183,7 @@
           :key="si + i"
         />
       </template>
-        <template slot="company">
+      <template slot="company">
         <span>{{ sitem.company }}</span>
         <el-popover placement="top" width="300" trigger="hover">
           <ul>
@@ -194,12 +194,12 @@
           <i class="el-icon-warning-outline fr" slot="reference"></i>
         </el-popover>
       </template>
-        <template slot="supplierName">
+      <template slot="supplierName">
         <span>{{ sitem.supplierName }}</span>
         <el-popover placement="top" width="300" trigger="hover">
           <ul>
             <li>
-              <span>供应商编号：</span><span>{{ sitem.supplierNo}}</span>
+              <span>供应商编号：</span><span>{{ sitem.supplierNo }}</span>
             </li>
           </ul>
           <i class="el-icon-warning-outline fr" slot="reference"></i>
@@ -268,7 +268,7 @@
       "
       :sitem="sitem"
       :columns="reColumns"
-       :border="border"
+      :border="border"
     >
       <template slot="good_name">
         <img
@@ -295,7 +295,7 @@
         </el-popover>
       </template>
       <template slot="send_way">
-        <span>{{ sitem.send_way === "1" ? "公司自提" : "供应商包邮" }}</span>
+        <span>{{ sitem.send_way === "1" ? "供应商包邮" : "公司自提" }}</span>
       </template>
 
       <template slot="good_type">
@@ -380,7 +380,6 @@ export default {
       type: Boolean,
       default: false,
     },
-    
   },
   computed: {},
   data() {

src/views/goodStore/active/components/baseForm.vue

@@ -159,7 +159,9 @@
                     :precision="0"
                     label="活动库存"
                   ></el-input-number>
-                  <span v-show="type === 'view'">{{ scope.row.activity_stock }}</span>
+                  <span v-show="type === 'view'">{{
+                    scope.row.activity_stock
+                  }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -511,11 +513,8 @@ export default {
     },
     platform_codesearchChange(e) {
       let old = this.ruleForm.platform_code;
-      console.log(e);
-      if (e) {
-        const { id, code, label } = e;
-        this.ruleForm.platform_code = id || "";
-      }
+      const { id, code, label } = e;
+      this.ruleForm.platform_code = id || "";
       this.$refs.ruleForm.validateField("platform_code");
       let newList = this.ruleForm.platform_code;
       if (old !== newList) {

src/views/goodStore/goodsCost/components/addEdit.vue

@@ -181,7 +181,7 @@ export default {
       loading: false,
       showModelThis: this.showModel,
       ruleForm: {
-        platform: [], //string	平台id
+        platform: "", //string	平台id
         online_reason: "", //string	上线原因
         online_remark: "", //string	上线备注
       },
@@ -243,7 +243,7 @@ export default {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
           this.ruleForm = {
-            platform: [], //string	平台id
+            platform: "", //string	平台id
             online_reason: "", //string	上线原因
             online_remark: "", //string	上线备注
           };
@@ -260,7 +260,7 @@ export default {
         if (valid) {
           this.loading = true;
           let model = JSON.parse(JSON.stringify(this.ruleForm));
-          model.platform = model.platform.toString();
+          // model.platform = model.platform.toString();
           model.codes = [];
           let list = JSON.parse(JSON.stringify(this.sitem));
           list.forEach((e) => {

src/views/goodStore/goodsOnline/add.vue

@@ -277,7 +277,7 @@ export default {
           list.forEach((e) => {
             model.codes.push(e.spuCode);
           });
-          model.platform = model.platform.toString();
+          // model.platform = model.platform.toString();
           let res = await asyncRequest.add(model);
           this.loading = false;
           if (res && res.code === 0) {
@@ -299,7 +299,7 @@ export default {
 
     resetFormData() {
       this.ruleForm = {
-        platform: [], //string	平台id
+        platform: "", //string	平台id
         codes: [], //string	无
         online_reason: "", //string	上线原因
         online_remark: "", //string	上线备注

src/views/purchaseIn/purchaseOrder/components/order-addedit-model.vue

@@ -1,464 +0,0 @@
-<template>
-  <el-dialog
-    v-loading="loading"
-    :title="title"
-    :center="true"
-    align="left"
-    top="10vh"
-    width="1040px"
-    :close-on-click-modal="false"
-    :visible.sync="showModelThis"
-    element-loading-text="拼命加载中"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    @close="showModelThis = false"
-  >
-    <el-card style="margin-top: -20px" class="account">
-      <el-row :gutter="10">
-        <el-col :span="24">
-          <el-form
-            :model="ruleForm"
-            :rules="rules"
-            status-icon
-            ref="ruleForm"
-            label-width="110px"
-            class="demo-ruleForm"
-          >
-            <el-row>
-              <el-row>
-                <el-col :span="12">
-                  <el-form-item label="采购供应商" prop="supplierNo">
-                    <search-supplier
-                      :disabled="isDisabled"
-                      :value="ruleForm.supplierNo"
-                      :placeholder="'请选择供应商'"
-                      :is-detail="true"
-                      :names="supplierName"
-                      @searchChange="selectSupplier"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="预计入库时间" prop="expecttime">
-                    <el-date-picker
-                      :disabled="isDisabled"
-                      v-model="ruleForm.expecttime"
-                      type="datetime"
-                      style="width: 100%"
-                      value-format="yyyy-MM-dd HH:mm:ss"
-                      placeholder="选择日期"
-                      :picker-options="pickerOptions"
-                      @change="selectTime"
-                    >
-                    </el-date-picker>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="实时金价" prop="now_god_price">
-                    <el-input
-                      placeholder="0"
-                      disabled
-                      v-model="ruleForm.now_god_price"
-                      maxlength="100"
-                    >
-                      <template slot="append">元</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="采购数量" prop="good_num">
-                    <el-input
-                      placeholder="0"
-                      disabled
-                      v-model="ruleForm.good_num"
-                      maxlength="100"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="商品重量" prop="weight">
-                    <el-input
-                      placeholder="0"
-                      v-model="ruleForm.weight"
-                      maxlength="100"
-                    >
-                      <template slot="append">g</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="工艺费" prop="teach_fee">
-                    <el-input
-                      placeholder="0"
-                      v-model="ruleForm.teach_fee"
-                      maxlength="100"
-                    >
-                      <template slot="append">元</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="包装费" prop="pakge_fee">
-                    <el-input
-                      placeholder="0"
-                      v-model="ruleForm.pakge_fee"
-                      maxlength="100"
-                    >
-                      <template slot="append">元</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="加标费" prop="mark_fee">
-                    <el-input
-                      placeholder="0"
-                      v-model="ruleForm.mark_fee"
-                      maxlength="100"
-                    >
-                      <template slot="append">元</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="证书费" prop="cert_fee">
-                    <el-input
-                      placeholder="0"
-                      v-model="ruleForm.cert_fee"
-                      maxlength="100"
-                    >
-                      <template slot="append">元</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="物流费" prop="delivery_fee">
-                    <el-input
-                      placeholder="0"
-                      v-model="ruleForm.delivery_fee"
-                      maxlength="100"
-                    >
-                      <template slot="append">元</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="开模费" prop="open_fee">
-                    <el-input
-                      placeholder="0"
-                      v-model="ruleForm.open_fee"
-                      maxlength="100"
-                    >
-                      <template slot="append">元</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="工差重量" prop="diff_weight">
-                    <el-input
-                      placeholder="0"
-                      v-model="ruleForm.diff_weight"
-                      maxlength="100"
-                    >
-                      <template slot="append">g</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="工差金额" prop="diff_fee">
-                    <el-input
-                      placeholder="0"
-                      v-model="ruleForm.diff_fee"
-                      maxlength="100"
-                    >
-                      <template slot="append">元</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8" v-if="!isDisabled">
-                  <el-form-item label="裸价" prop="nake_fee">
-                    <el-input
-                      v-model="ruleForm.nake_fee"
-                      placeholder="0"
-                      maxlength="100"
-                    >
-                      <template slot="append">元</template>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24"
-                  ><el-form-item label="备注" prop="remark">
-                    <el-input
-                      :disabled="isDisabled"
-                      type="textarea"
-                      maxlength="250"
-                      :autosize="{ minRows: 2, maxRows: 4 }"
-                      v-model="ruleForm.remark"
-                    /> </el-form-item
-                ></el-col>
-              </el-row>
-
-              <el-col :span="19" class="gongshi">
-                <el-row>
-                  <el-col :span="24">
-                    <span class="tuan chu">
-                      <span>开模费</span>
-                      <span>采购数量</span>
-                    </span>
-                    <span class="icon-span">+</span>
-                    <span class="tuan cheng"
-                      ><span class="name">商品重量(g)</span
-                      ><span class="icon-span">×</span>
-                      <span class="name">实时金价</span></span
-                    >
-                    <span class="icon-span">+</span>
-                    <span class="tuan cheng">
-                      <span class="name">工艺费</span
-                      ><span class="icon-span">×</span>
-                      <span class="name">商品重量(g)</span>
-                    </span>
-                    <span class="icon-span">+</span>
-                    <span class="label">包装费</span
-                    ><span class="icon-span">+</span>
-                    <span class="label">裸价</span
-                    ><span class="icon-span">+</span>
-                    <span class="label">加标费</span
-                    ><span class="icon-span">+</span>
-                    <span class="label">证书费</span>
-                    <span class="icon-span">+</span>
-                    <span class="label">物流费</span
-                    ><span class="icon-span">=</span>
-                  </el-col>
-                  <el-col :span="24">
-                    <span class="label">参考商品单价：</span>
-                    <span class="good_price">{{ good_price }}</span>
-                  </el-col>
-                </el-row>
-              </el-col>
-              <el-col :span="5" style="text-align: right">
-                <el-button type="primary" @click="submitForm">保 存 </el-button>
-                <el-button @click="showModelThis = false">关 闭</el-button>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-col>
-      </el-row>
-    </el-card>
-  </el-dialog>
-</template>
-<script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
-import resToken from "@/mixins/resToken";
-import rules from "./rules";
-export default {
-  name: "Account",
-  props: ["showModel", "id", "sitem"],
-  mixins: [resToken],
-  data() {
-    return {
-      roleList: [],
-      loading: false,
-      title: "修改采购反馈",
-      organizeList: [],
-      showModelThis: this.showModel,
-      rulesThis: this.rules,
-      supplierName: "",
-      good_price: "0",
-      lasttime: "",
-      ruleForm: {
-        nake_fee: "", //裸价
-        wsm_code: "", //仓库
-        supplier_code: "", //供应商
-        supplierNo: [], //采购供应商编码
-        good_num: "",
-        expecttime: "",
-        weight: "",
-        now_god_price: "",
-        teach_fee: "",
-        pakge_fee: "",
-        mark_fee: "",
-        cert_fee: "",
-        delivery_fee: "",
-        open_fee: "",
-        diff_weight: "",
-        diff_fee: "",
-        remark: "",
-      },
-      rules: rules,
-    };
-  },
-  watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
-      if (val) {
-        this.initForm();
-      }
-    },
-    showModelThis(val) {
-      if (!val) {
-        this.$emit("cancel");
-      }
-    },
-  },
-  methods: {
-    
-
-    async initForm() {
-      this.loading = true;
-      this.rulesThis = this.rules;
-      await this.resetForm();
-      this.loading = false;
-    },
-    // 选择供应商
-    selectSupplier(e) {
-      if (e && e.id) {
-        this.ruleForm.supplierNo = [e.code];
-      } else {
-        this.ruleForm.supplierNo = [];
-        this.ruleForm.stock_code = [];
-      }
-      this.$refs.ruleForm.validateField("supplierNo ");
-    },
-    //初始化表单
-    async resetForm() {
-      await this.$nextTick(() => {
-        if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          const {
-            good_price,
-            nake_fee,
-            wsm_code,
-            supplierNo,
-            weight,
-            now_god_price,
-            teach_fee,
-            pakge_fee,
-            mark_fee,
-            cert_fee,
-            delivery_fee,
-            open_fee,
-            diff_weight,
-            diff_fee,
-            remark,
-            good_num,
-            supplier_name,
-            lasttime,
-            cgdNo
-          } = this.sitem;
-          this.good_price = good_price || "0";
-          this.supplierName = supplier_name;
-          this.lasttime = lasttime || "";
-          this.ruleForm = {
-            cgdNo: cgdNo||"",
-            nake_fee: nake_fee || "0", //裸价
-            wsm_code: wsm_code || "", //仓库
-            cgder_id: "",
-            supplierNo: supplierNo ? [supplierNo] : [], //采购供应商
-            good_num: good_num || "0",
-            expecttime: lasttime || "", //预计入库时间
-            weight: weight ? parseInt(weight + "") + "" : "0", //贵金属重量
-            now_god_price: now_god_price || "10", //实时金价
-            teach_fee: teach_fee || "0", //工艺费
-            pakge_fee: pakge_fee || "0", //包装费
-            mark_fee: mark_fee || "0", //加标费
-            cert_fee: cert_fee || "0", //证书费
-            delivery_fee: delivery_fee || "0", //物流费
-            open_fee: open_fee || "0", //开模费
-            diff_weight: diff_weight ? parseInt(diff_weight + "") + "" : "0", //工差重量
-            diff_fee: diff_fee || "0", //工差金额
-            remark: remark,
-            good_price: "",
-          };
-        }
-      });
-    },
-    // 保存更改
-    async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          this.loading = true;
-          const item = JSON.parse(JSON.stringify(this.ruleForm));
-          item.supplierNo = item.supplierNo.toString();
-
-          console.log(item);
-          const res = await asyncRequest.update(item);
-          this.loading = false;
-          if (res && res.code === 0) {
-            this.$notify.success({
-              title: "添加成功",
-              message: "",
-            });
-            this.showModelThis = false;
-            this.$emit("refresh"); //抛出事件给详情页。
-          } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
-          } else {
-            this.$message.warning(res.message);
-          }
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-  },
-};
-</script>
-
-   <style lang="scss" scoped>
-.account {
-  .gongshi {
-    span {
-      vertical-align: top;
-      display: inline-block;
-      color: #000;
-    }
-    .icon-span {
-      padding: 0 5px;
-      height: 40px;
-      line-height: 40px;
-      font-size: 20px;
-      color: #606266;
-      display: inline-block;
-      // vertical-align: top;
-      // display: inline-block;
-    }
-    .label {
-      height: 40px;
-      line-height: 40px;
-    }
-    .tuan {
-      &.chu {
-        width: 60px;
-        height: 40px;
-        display: inline-block;
-        span {
-          width: 60px;
-          display: inline-block;
-          line-height: 20px;
-          text-align: center;
-          font-size: 12px;
-          height: 20px;
-          &:last-child {
-            border-top: 1px solid #606266;
-          }
-        }
-      }
-      &.cheng {
-        .name {
-          height: 40px;
-          line-height: 40px;
-        }
-        .icon-span {
-          line-height: 40px;
-          font-size: 16px;
-          padding: 0 1px;
-        }
-      }
-    }
-  }
-}
-</style>

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -66,40 +66,6 @@
                     <i class="el-icon-warning-outline fr" slot="reference"></i>
                   </el-popover>
                 </template>
-                <template slot="good_name">
-                  <span v-if="sitem.goodinfo">
-                    <img
-                      style="display: inline-block; width: 20px; height: 20px"
-                      class="hover fl"
-                      v-viewer
-                      v-if="sitem.goodinfo.good_thumb_img"
-                      :src="sitem.goodinfo.good_thumb_img"
-                      alt=""
-                    />
-                    <span style="padding: 0 0 0 5px">{{
-                      sitem.goodinfo.good_name
-                    }}</span>
-                    <span
-                      v-for="(si, sii) in sitem.goodinfo.speclist"
-                      :key="sii + si.id"
-                    >
-                      <span>{{ sii === 0 ? "_" : "--" }}</span
-                      ><span>{{ si.spec_name }}[{{ si.spec_value }}]</span>
-                    </span>
-                    <el-popover placement="top" width="300" trigger="hover">
-                      <ul>
-                        <li>
-                          <span>商品编号：</span
-                          ><span>{{ sitem.spuCode }}</span>
-                        </li>
-                      </ul>
-                      <i
-                        class="el-icon-warning-outline fr my-class"
-                        slot="reference"
-                      ></i>
-                    </el-popover>
-                  </span>
-                </template>
 
                 <template slot="status">
                   <el-tag
@@ -202,13 +168,7 @@
         @cancel="diffAdd = false"
       />
 
-      <order-addedit-model
-        :id="modelId"
-        :show-model="showModel"
-        :sitem="detailSitem"
-        @refresh="initData()"
-        @cancel="showModel = false"
-      />
+   
     </div>
     <div v-else>
       <no-auth></no-auth>
@@ -221,14 +181,12 @@ import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import orderInTable from "./components/order-in-table";
 import ShowDataTableColumns from "./components/ShowDataTableColumns";
-import orderAddeditModel from "./components/order-addedit-model";
 import { order_type_options, statusOptions } from "./columns";
 export default {
   name: "purchaseOrderDetail",
   mixins: [mixinPage, resToken],
   components: {
     orderInTable,
-    orderAddeditModel,
   },
 
   computed: {
@@ -247,9 +205,6 @@ export default {
   data() {
     return {
       activeTabs: "1",
-      detailSitem: null,
-      modelId: "",
-      showModel: false,
       ShowDataTableColumns: ShowDataTableColumns,
       isMetal: false,
       finishStatus: "finish",
@@ -274,11 +229,7 @@ export default {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
-    addForm() {
-      this.detailSitem = this.sitem;
-      this.modelId = this.id;
-      this.showModel = true;
-    },
+  
     openModal() {
       this.diffAdd = true;
       this.ReturnAddModel = true;

src/views/purchaseIn/purchaseOrder/index.vue

@@ -42,9 +42,9 @@
                 >
                   <el-option
                     v-for="item in statusOptions"
-                    :key="'status' + item.code"
+                    :key="'status' + item.value"
                     :label="item.label"
-                    :value="item.code"
+                    :value="item.value"
                   />
                 </el-select>
               </el-col>
@@ -143,15 +143,6 @@
                     <el-option label="申请人" value="6"></el-option>
                     <el-option label="采购供应商编号" value="7"></el-option>
                   </el-select>
-                  <el-button
-                    slot="append"
-                    @click="
-                      pageInfo.curr = 1;
-                      parmValue.page = 1;
-                      searchList();
-                    "
-                    icon="el-icon-search"
-                  ></el-button>
                 </el-input>
               </el-col>
 
@@ -171,9 +162,7 @@
         <template #good_name="{ scope }">
           <span>{{ scope.row.good_name }}</span>
           <span v-for="(si, i) in scope.row.speclist" :key="si.spec_id + i">
-            <span v-if="i !== 0">-</span>
-            <span v-else>_</span>
-            <span>{{ si.spec_name }}[{{ si.spec_value }}]</span>
+            {{ i === 0 ? "__" : "--" }}{{ si.spec_name }}[{{ si.spec_value }}]
           </span>
         </template>
         <template #status="{ scope }">

src/views/purchaseIn/workbench/detail.vue

@@ -172,10 +172,15 @@
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <el-tag type="''" :size="'mini'" v-if="scope.row.bargain_status === '0'"
+                <el-tag
+                  type="''"
+                  :size="'mini'"
+                  v-if="scope.row.bargain_status === '0'"
                   >新建信息</el-tag
                 >
-                <el-tag type="danger" :size="'mini'" v-else>历史信息，需确认</el-tag>
+                <el-tag type="danger" :size="'mini'" v-else
+                  >历史信息，需确认</el-tag
+                >
               </template></el-table-column
             >
 
@@ -283,6 +288,8 @@ export default {
   },
   data() {
     return {
+      num: 60,
+      timer: null,
       loading: false,
       showModel: false,
       tableData: [],
@@ -308,7 +315,11 @@ export default {
   mounted() {
     this.initForm();
   },
-
+  beforeDestroy() {
+    if (this.timer) {
+      clearInterval(this.timer);
+    }
+  },
   methods: {
     async initForm() {
       this.editType = "wait";
@@ -324,41 +335,76 @@ export default {
     },
 
     async initData() {
-      this.loading = true;
       const { code, message, data } = await asyncRequest.detail({
         infoNo: this.queryId,
       });
-      this.loading = false;
       if (code === 0) {
-        this.sitem = JSON.parse(JSON.stringify(data));
-        const { status, can } = this.sitem;
-        if (can && can.length > 0) {
-          let can_name = "",
-            can_id_arr = [],
-            is_metal = false;
-          can.forEach((e, i) => {
-            can_name += i == 0 ? e.name : `_${e.name}`;
-            can_id_arr.push(e.id);
-            if (e.id === "6") {
-              is_metal = true;
-            }
-          });
-          this.sitem.is_metal = is_metal;
-          this.sitem.can_id_arr = can_id_arr;
-
-          this.sitem.can_name = can_name;
-        } else {
-          this.sitem.can_id_arr = [];
-          this.sitem.can_name = "";
-        }
+        const { status } = data;
         this.status = status;
+        this.sitem = JSON.parse(JSON.stringify(data));
+        const { can } = this.sitem;
+        this.sitem.is_metal = "";
+        this.sitem.can_id_arr = [];
+        this.sitem.can_name = "";
+        let can_name = "",
+          can_id_arr = [],
+          is_metal = false;
+        can.forEach((e, i) => {
+          can_name += i == 0 ? e.name : `_${e.name}`;
+          can_id_arr.push(e.id);
+          if (e.id === "6") {
+            is_metal = true;
+          }
+        });
+        this.sitem.is_metal = is_metal;
+        this.sitem.can_id_arr = can_id_arr;
+        this.sitem.can_name = can_name;
         this.getNewTime();
+        await this.well_timer();
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
         this.$message.warning(message);
       }
     },
+    async well_timer() {
+      this.timer = setInterval(async () => {
+        if (this.num !== 0) {
+          this.num--;
+        } else {
+          if (this.timer) {
+            const { code, status, message } = await this.repeat_initData();
+            if (code === 0 && status === "1") {
+              this.num = 60;
+            } else if (code === 0 && status !== "1") {
+              this.status = status;
+              this.clearTime();
+            } else if (code >= 100 && code <= 104) {
+              this.clearTime();
+              await this.logout();
+            } else {
+              this.clearTime();
+              this.$message.warning(message);
+            }
+          }
+        }
+      }, 1000);
+    },
+    clearTime() {
+      if (this.timer) {
+        clearInterval(this.timer);
+        this.num = 0;
+      }
+    },
+    async repeat_initData() {
+      const { code, message, data } = await asyncRequest.detail({
+        infoNo: this.queryId,
+      });
+      const { status } = data;
+      const res = { code, status, message };
+
+      return res;
+    },
     getNewTime() {
       this.newTime = new Date().valueOf();
     },

src/views/purchaseIn/wsmInOrder/components/wsm-in-order-addEdit-form.vue

@@ -1,353 +0,0 @@
-<template>
-  <el-form
-    v-loading="loading"
-    :model="ruleForm"
-    :rules="rulesThis"
-    status-icon
-    :size="'small'"
-    ref="ruleForm"
-    label-width="85px"
-    class="demo-ruleForm"
-  >
-    <el-row>
-      <el-col :span="id === 'add' ? 12 : 12">
-        <el-form-item label="可入库总数" prop="wsend_num">
-          <el-input
-            disabled
-            placeholder="可入库总数"
-            v-model="ruleForm.wsend_num"
-            maxlength="100"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="id === 'add' ? 12 : 12">
-        <el-form-item label="入库数量" prop="send_num">
-          <digital-input
-            :values="ruleForm.send_num"
-            :placeholder="'入库数量'"
-            :min="0"
-            :name="'ruleForm.send_num'"
-            :disabled="id !== 'add'"
-            :max="ruleForm.wsend_num"
-            :position="'right'"
-            :precision="0"
-            :size="'small'"
-            :controls="false"
-            :append="''"
-            @reschange="number_change($event, 'send_num')"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="id === 'add' ? 12 : 12">
-        <el-form-item label="发货方式" prop="sendtype">
-          <el-select
-            v-model="ruleForm.sendtype"
-            style="width: 100%"
-            :disabled="id !== 'add'"
-            placeholder="发货方式"
-            @change="sendtypeChange"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="id === 'add' ? 12 : 12">
-        <el-form-item label="物流费用" prop="post_fee">
-          <digital-input
-            :values="ruleForm.post_fee"
-            :placeholder="'物流费用'"
-            :min="0"
-            :name="'ruleForm.post_fee'"
-            :disabled="id !== 'add'"
-            :max="ruleForm.post_fee"
-            :position="'right'"
-            :precision="2"
-            :size="'small'"
-            :controls="false"
-            :append="'元'"
-            @reschange="number_change($event, 'post_fee')"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="id === 'add' ? 24 : 12" v-if="ruleForm.sendtype === '1'">
-        <el-form-item label="物流公司" prop="post_company">
-          <search-express
-            :disabled="id !== 'add'"
-            :value="ruleForm.post_company"
-            :placeholder="'物流公司'"
-            :names="''"
-            :is-detail="false"
-            @searchChange="handleCompany"
-          />
-        </el-form-item>
-      </el-col>
-      <el-col :span="id === 'add' ? 24 : 12" v-if="ruleForm.sendtype === '1'">
-        <el-form-item label="物流单号" prop="post_code">
-          <el-input
-            :disabled="id !== 'add'"
-            placeholder="物流单号"
-            v-model="ruleForm.post_code"
-            maxlength="100"
-          />
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="id === 'add' ? 12 : 12">
-        <el-form-item label="发货时间" prop="post_time">
-          <el-date-picker
-            :disabled="id !== 'add'"
-            v-model="ruleForm.post_time"
-            type="datetime"
-            style="width: 100%"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="发货时间"
-            :picker-options="pickerOptions"
-            @change="selectTime"
-          >
-          </el-date-picker>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12" style="text-align: right" v-if="id === 'add'">
-        <el-button type="primary" :size="'mini'" @click="submitForm"
-          >保 存
-        </el-button>
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-<script>
-import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
-import resToken from "@/mixins/resToken";
-import { isnumber, isnumber2, isAlphanumeric } from "@/utils/validate";
-export default {
-  name: "wsmInOrderAdd",
-  props: ["id", "sitem", "newTime", "modelSitem"],
-  mixins: [resToken],
-  data() {
-    const validate_num = (rule, value, callback) => {
-      const { required } = rule;
-      if (required && value === "") {
-        callback(new Error("不能为空！"));
-      } else {
-        callback();
-      }
-    };
-    const validate_num_0 = (rule, value, callback) => {
-      const { required } = rule;
-      if (required && value === "") {
-        callback(new Error("不能为空！"));
-      } else if (
-        required &&
-        (value === "0" ||
-          value === "0." ||
-          value === "0.0" ||
-          value === "0.00" ||
-          value === "0.000")
-      ) {
-        callback(new Error("不能为零！"));
-      } else {
-        callback();
-      }
-    };
-    const validateCode = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("不能为空!"));
-      } else {
-        if (!isAlphanumeric(value)) {
-          callback(new Error("仅支持字母和数字!"));
-        } else {
-          callback();
-        }
-      }
-    };
-
-    return {
-      loading: true,
-      ruleForm: {
-        wsm_mobile: "",
-        wsm_contactor: "",
-        wsm_addr: "",
-        cgdNo: "",
-        wsm_code: "",
-        post_company: [],
-        post_code: "",
-        post_fee: "",
-        post_time: "",
-        send_num: "",
-        status: "1",
-      },
-      rulesThis: this.rules,
-      options: [
-        {
-          value: "1",
-          label: "公司自提",
-        },
-        {
-          value: "2",
-          label: "供应商包邮",
-        },
-      ],
-      pickerOptions: {
-        disabledDate: (time) => {
-          return time.getTime() > new Date().valueOf();
-        },
-      },
-      rules: {
-        send_num: [
-          {
-            required: true,
-            validator: validate_num_0,
-            trigger: "blur",
-          },
-        ],
-        post_company: [
-          {
-            type: "array",
-            required: true,
-            trigger: "change",
-            message: "请输入物流公司",
-          },
-        ],
-        sendtype: [
-          {
-            required: true,
-            trigger: "change",
-            message: "选择发货方式",
-          },
-        ],
-        post_code: [
-          {
-            required: true,
-            validator: validateCode,
-            trigger: "blur",
-          },
-        ],
-        post_fee: [
-          {
-            required: true,
-            validator: validate_num,
-            trigger: "blur",
-          },
-        ],
-        post_time: [
-          {
-            required: true,
-            message: "请选择发货时间",
-            trigger: "change",
-          },
-        ],
-      },
-    };
-  },
-  watch: {
-    newTime: function (val) {
-      if (val) {
-        this.initForm();
-      }
-    },
-  },
-  mounted() {
-    this.initForm();
-  },
-  methods: {
-    async initForm() {
-      this.loading = true;
-      this.rulesThis = this.rules;
-      await this.resetForm();
-      this.loading = false;
-    },
-
-    //初始化表单
-    async resetForm() {
-      await this.$nextTick(() => {
-        if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          if (this.id === "add") {
-            const {
-              post_company,
-              post_code,
-              post_fee,
-              sendtime,
-              cgdNo,
-              wsm_code,
-              wsend_num,
-              sendtype,
-            } = this.sitem;
-            this.ruleForm = {
-              // wsm_mobile,
-              // wsm_contactor,
-              // wsm_addr,
-              wsend_num: wsend_num || "",
-              cgdNo: cgdNo || "",
-              wsm_code: wsm_code || "",
-              post_company: post_company ? [post_company] : [],
-              post_code: post_code || "",
-              post_fee: post_fee || "",
-              post_time: sendtime || "",
-              sendtype: sendtype || "1",
-              send_num: wsend_num || "1",
-              status: "1",
-            };
-          }
-          console.log(this.sitem);
-        }
-      });
-    },
-    number_change(e, key) {
-      this.ruleForm[key] = e + "" || "0";
-      this.$refs.ruleForm.validateField(key);
-    },
-    sendtypeChange() {
-      const { sendtype } = this.ruleForm;
-      this.rulesThis.post_code[0].required = sendtype === "1";
-      this.rulesThis.post_company[0].required = sendtype === "1";
-    },
-    // 保存更改
-    async submitForm() {
-      console.log(this.rules);
-      await this.$refs.ruleForm.validate(async (valid) => {
-        if (valid) {
-          this.loading = true;
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-          model.post_company = model.post_company.toString();
-          const { code, message } = await asyncRequest.orderinadd(model);
-          this.loading = false;
-          if (code === 0) {
-            this.$notify.success({
-              title: "添加成功",
-              message: "",
-            });
-            this.$emit("refresh"); //抛出事件给详情页。
-          } else if (code >= 100 && code <= 104) {
-            await this.logout();
-          } else if (code === "1009") {
-            this.$message.warning(`${message},请刷新采购单详情重试！`);
-          } else {
-            this.$message.warning(message);
-          }
-        } else {
-          console.log("error submit!!");
-          return false;
-        }
-      });
-    },
-    handleCompany(e) {
-      console.log(e);
-      this.ruleForm.post_company = e && e.code ? [e.label] : [];
-      this.$refs.ruleForm.validateField("post_company");
-    },
-  },
-};
-</script>
-
-   <style lang="scss" scoped>
-.account {
-}
-</style>

src/views/purchaseIn/wsmInOrder/components/wsm-in-order-error-model.vue

@@ -28,10 +28,18 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="异常数量" prop="num">
-                  <el-input
-                    v-model="ruleForm.num"
-                    placeholder="异常数量"
-                    maxlength="50"
+                  <digital-input
+                    :values="ruleForm.num"
+                    :placeholder="'异常数量'"
+                    :min="0"
+                    :disabled="false"
+                    :max="1000000000"
+                    :position="'right'"
+                    :precision="0"
+                    :size="'mini'"
+                    :controls="false"
+                    :append="''"
+                    @reschange="number_change($event, 'num')"
                   />
                 </el-form-item>
                 <el-form-item label="异常原因" prop="error_code">
@@ -201,6 +209,10 @@ export default {
       await this.resetForm();
       this.loading = false;
     },
+    number_change(e, key) {
+      this.ruleForm[key] = e + "" || "0";
+      this.$refs.ruleForm.validateField(key);
+    },
     //异常原因筛选
     elSelectChange(e) {
       let oindex = this.options.findIndex((v) => v.result_code === e);
@@ -320,9 +332,9 @@ export default {
         border: 1px solid rgb(220, 223, 230);
         // border-left: 0;
         box-sizing: border-box;
-        width: 70px;
-        height: 70px;
-        line-height: 70px;
+        width: 50px;
+        height: 50px;
+        line-height: 50px;
         position: relative;
         img {
           display: inline-block;
@@ -334,11 +346,11 @@ export default {
           top: 0;
           right: 0;
           z-index: 2;
-          width: 25px;
-          height: 25px;
+          width: 20px;
+          height: 20px;
           text-align: center;
-          line-height: 25px;
-          font-size: 19px;
+          line-height: 20px;
+          font-size: 14px;
           &:hover {
             color: #63cbe7;
           }

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

@@ -16,13 +16,131 @@
     <el-card style="margin-top: -20px">
       <el-row :gutter="10">
         <el-col :span="24">
-          <wsm-in-order-addEdit-form
-            v-if="showModelThis"
-            :id="'add'"
-            :newTime="newTime"
-            :sitem="sitem"
-            @refresh="(showModelThis = false), $emit('refresh')"
-          />
+          <el-form
+            v-loading="loading"
+            :model="ruleForm"
+            :rules="rulesThis"
+            status-icon
+            :size="'small'"
+            ref="ruleForm"
+            label-width="85px"
+            class="demo-ruleForm"
+          >
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label="可入库总数"
+                  prop="wsend_num"
+                  required
+                  label-width="95px"
+                >
+                  <el-input
+                    disabled
+                    placeholder="可入库总数"
+                    v-model="ruleForm.wsend_num"
+                    maxlength="100"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="入库数量" prop="send_num">
+                  <digital-input
+                    :values="ruleForm.send_num"
+                    :placeholder="'入库数量'"
+                    :min="0"
+                    :name="'ruleForm.send_num'"
+                    :disabled="false"
+                    :max="ruleForm.wsend_num"
+                    :position="'right'"
+                    :precision="0"
+                    :size="'small'"
+                    :controls="false"
+                    :append="''"
+                    @reschange="number_change($event, 'send_num')"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="发货方式" prop="sendtype">
+                  <el-select
+                    v-model="ruleForm.sendtype"
+                    style="width: 100%"
+                    :disabled="
+                      (sitem && sitem.order_type === '3') ||
+                      (sitem && sitem.order_type === '4')
+                    "
+                    placeholder="发货方式"
+                    @change="sendtypeChange"
+                  >
+                    <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="物流费用" prop="post_fee">
+                  <digital-input
+                    :values="ruleForm.post_fee"
+                    :placeholder="'物流费用'"
+                    :min="0"
+                    :disabled="false"
+                    :max="100000000000"
+                    :position="'right'"
+                    :precision="2"
+                    :size="'small'"
+                    :controls="false"
+                    :append="'元'"
+                    @reschange="number_change($event, 'post_fee')"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="ruleForm.sendtype === '1'">
+                <el-form-item label="物流公司" prop="post_company">
+                  <search-express
+                    :value="ruleForm.post_company"
+                    :placeholder="'物流公司'"
+                    :names="''"
+                    :is-detail="false"
+                    @searchChange="handleCompany"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24" v-if="ruleForm.sendtype === '1'">
+                <el-form-item label="物流单号" prop="post_code">
+                  <el-input
+                    placeholder="物流单号"
+                    v-model="ruleForm.post_code"
+                    maxlength="100"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="12">
+                <el-form-item label="发货时间" prop="post_time">
+                  <el-date-picker
+                    v-model="ruleForm.post_time"
+                    type="datetime"
+                    style="width: 100%"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="发货时间"
+                    :picker-options="pickerOptions"
+                    @change="selectTime"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12" style="text-align: right">
+                <el-button type="primary" :size="'mini'" @click="submitForm"
+                  >保 存
+                </el-button>
+              </el-col>
+            </el-row>
+          </el-form>
         </el-col>
       </el-row>
     </el-card>
@@ -30,20 +148,128 @@
 </template>
    <script>
 import resToken from "@/mixins/resToken";
-import wsmInOrderAddEditForm from "./wsm-in-order-addEdit-form";
-
+import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
+import { isAlphanumeric } from "@/utils/validate";
 export default {
-  name: "purchaseOrder",
-  props: ["showModel", "id",  "sitem"],
-  components: { wsmInOrderAddEditForm},
+  name: "wsmInOrderAdd",
+  props: ["showModel", "id", "sitem"],
   mixins: [resToken],
   data() {
+    const validate_num = (rule, value, callback) => {
+      const { required } = rule;
+      if (required && value === "") {
+        callback(new Error("不能为空！"));
+      } else {
+        callback();
+      }
+    };
+    const validate_num_0 = (rule, value, callback) => {
+      const { required } = rule;
+      if (required && value === "") {
+        callback(new Error("不能为空！"));
+      } else if (
+        required &&
+        (value === "0" ||
+          value === "0." ||
+          value === "0.0" ||
+          value === "0.00" ||
+          value === "0.000")
+      ) {
+        callback(new Error("不能为零！"));
+      } else {
+        callback();
+      }
+    };
+    const validateCode = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("不能为空!"));
+      } else {
+        if (!isAlphanumeric(value)) {
+          callback(new Error("仅支持字母和数字!"));
+        } else {
+          callback();
+        }
+      }
+    };
+
     return {
       showModelThis: this.showModel,
-      loading: false,
-      title: "",
-      sitem: null,
-      newTime: "",
+      loading: true,
+      ruleForm: {
+        wsm_mobile: "",
+        wsm_contactor: "",
+        wsm_addr: "",
+        cgdNo: "",
+        wsm_code: "",
+        post_company: [],
+        post_code: "",
+        post_fee: "",
+        post_time: "",
+        send_num: "",
+        sendtype: "1",
+        status: "1",
+      },
+      rulesThis: this.rules,
+      options: [
+        {
+          value: "1",
+          label: "公司自提",
+        },
+        {
+          value: "2",
+          label: "供应商包邮",
+        },
+      ],
+      pickerOptions: {
+        disabledDate: (time) => {
+          return time.getTime() > new Date().valueOf();
+        },
+      },
+      rules: {
+        send_num: [
+          {
+            required: true,
+            validator: validate_num_0,
+            trigger: "blur",
+          },
+        ],
+        post_company: [
+          {
+            type: "array",
+            required: true,
+            trigger: "change",
+            message: "请输入物流公司",
+          },
+        ],
+        sendtype: [
+          {
+            required: true,
+            trigger: "change",
+            message: "选择发货方式",
+          },
+        ],
+        post_code: [
+          {
+            required: true,
+            validator: validateCode,
+            trigger: "blur",
+          },
+        ],
+        post_fee: [
+          {
+            required: true,
+            validator: validate_num,
+            trigger: "blur",
+          },
+        ],
+        post_time: [
+          {
+            required: true,
+            message: "请选择发货时间",
+            trigger: "change",
+          },
+        ],
+      },
     };
   },
   watch: {
@@ -60,16 +286,88 @@ export default {
     },
   },
   methods: {
-    
     async initForm() {
       this.loading = true;
-
+      console.log(this.sitem);
+      this.rulesThis = this.rules;
+      await this.resetForm();
       this.loading = false;
     },
-
-    
-    getNewTime() {
-      this.newTime = new Date().valueOf();
+    //初始化表单
+    async resetForm() {
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields();
+          this.$refs.ruleForm.clearValidate();
+          const { cgdNo, wsend_num, goodinfo } = this.sitem;
+          const { send_way } = goodinfo;
+          this.ruleForm = {
+            wsm_mobile: "",
+            wsm_contactor: "",
+            wsm_addr: "",
+            cgdNo: cgdNo || "",
+            wsm_code: "",
+            post_company: [],
+            post_code: "",
+            post_fee: "",
+            post_time: "",
+            wsend_num: wsend_num || "0",
+            sendtype: send_way === "0" ? "1" : "2" || "1",
+            send_num: wsend_num || "0",
+            status: "1",
+          };
+        }
+      });
+    },
+    number_change(e, key) {
+      this.ruleForm[key] = e + "" || "0";
+      this.$refs.ruleForm.validateField(key);
+    },
+    sendtypeChange() {
+      const { sendtype } = this.ruleForm;
+      this.rulesThis.post_code[0].required = sendtype === "1";
+      this.rulesThis.post_company[0].required = sendtype === "1";
+    },
+    // 保存更改
+    async submitForm() {
+      console.log(this.rules);
+      await this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          this.loading = true;
+          let model = JSON.parse(JSON.stringify(this.ruleForm));
+          model.post_company = model.post_company.toString();
+          let time1 = new Date(model.post_time).valueOf();
+          let time2 = new Date().valueOf();
+          if (time1 >= time2) {
+            this.$message.warning(`发货时间不能选择未来时间！`);
+            this.loading = false;
+            return;
+          }
+          const { code, message } = await asyncRequest.orderinadd(model);
+          this.loading = false;
+          if (code === 0) {
+            this.$notify.success({
+              title: "添加成功",
+              message: "",
+            });
+            this.$emit("refresh"); //抛出事件给详情页。
+          } else if (code >= 100 && code <= 104) {
+            await this.logout();
+          } else if (code === "1009") {
+            this.$message.warning(`${message},请刷新采购单详情重试！`);
+          } else {
+            this.$message.warning(message);
+          }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    handleCompany(e) {
+      console.log(e);
+      this.ruleForm.post_company = e && e.code ? [e.label] : [];
+      this.$refs.ruleForm.validateField("post_company");
     },
   },
 };

src/views/purchaseIn/wsmInOrder/components/wsm-in-order-record-form.vue

@@ -21,13 +21,19 @@
             </el-input>
           </el-form-item>
           <el-form-item label="正常数量" prop="wsm_num">
-            <el-input
-              placeholder="正常数量"
-              :disabled="status !== '1'"
-              v-model="ruleForm.wsm_num"
-              maxlength="100"
-            >
-            </el-input>
+            <digital-input
+              :values="ruleForm.wsm_num"
+              :placeholder="'正常数量'"
+              :min="0"
+              :disabled="false"
+              :max="ruleForm.send_num"
+              :position="'right'"
+              :precision="0"
+              :size="'mini'"
+              :controls="false"
+              :append="''"
+              @reschange="number_change($event, 'wsm_num')"
+            />
           </el-form-item>
         </el-form>
       </el-col>
@@ -40,7 +46,6 @@
           @refresh="errorModel"
           @cancel="showModel = false"
         />
-        <!-- <el-button type="primary" @click=""> 新建 </el-button> -->
         <el-form
           :model="tableForm"
           :rules="tableRules"
@@ -76,7 +81,7 @@
                       v-viewer
                       class="hover"
                     >
-                      <img :src="item"  alt="" />
+                      <img :src="item" alt="" />
                     </li>
                   </ul>
                 </template>
@@ -259,6 +264,10 @@ export default {
         }
       });
     },
+    async number_change(e, key) {
+      this.ruleForm[key] = e + "" || "0";
+      this.$refs.ruleForm.validateField(key);
+    },
     addError(index) {
       this.modelAllnum = "2";
       this.modelitem = index === -1 ? {} : this.tableForm.error_list[index];

src/views/purchaseIn/wsmInOrder/detail.vue

@@ -4,7 +4,7 @@
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <!-- <p>{{ status }}---{{ powers }}</p> -->
+      <p>{{ status }}---{{ powers }}</p>
 
       <div class="detail-page-title">
         <span class="title">入库单编号：{{ queryId }}</span>
@@ -88,14 +88,6 @@
                   }}</span></template
                 >
               </show-data-table>
-              <!-- <wsm-in-order-addEdit-form
-            v-if="newTime !== ''"
-            :id="queryId"
-            :newTime="newTime"
-            :modelSitem="{}"
-            :sitem="sitem"
-            @refresh="initData()"
-          /> -->
             </el-collapse-item>
             <el-collapse-item title="商品信息" name="2">
               <show-goods-data-table
@@ -107,7 +99,11 @@
                 :iscgd="true"
               />
             </el-collapse-item>
-            <el-collapse-item title="入库验收" name="3">
+            <el-collapse-item
+              title="入库验收登记"
+              name="3"
+              v-if="sitem.sendtype === '1'"
+            >
               <wsm-in-order-record-form
                 v-if="newTime !== ''"
                 :id="queryId"
@@ -116,8 +112,18 @@
                 @refresh="initData()"
               />
             </el-collapse-item>
-            <el-collapse-item title="入库验收审核" name="4">
-              <!-- v-if="status !== '4'" -->
+            <el-collapse-item
+              title="入库验收登记审核"
+              name="4"
+              v-if="
+                sitem.sendtype === '1' &&
+                (status === '2' ||
+                  status === '3' ||
+                  status === '4' ||
+                  status === '5' ||
+                  status === '6')
+              "
+            >
               <wsm-in-order-check-form
                 v-if="newTime !== ''"
                 :id="queryId"
@@ -131,7 +137,11 @@
             <el-collapse-item
               title="入库审核"
               name="5"
-              v-if="status == '3' && powers.some((item) => item == '031')"
+              v-if="
+                status == '3' &&
+                powers.some((item) => item == '031') &&
+                sitem.sendtype === '1'
+              "
             >
               <exam-form
                 :statusList="statusList"
@@ -146,7 +156,11 @@
             <el-collapse-item
               title="入库退货"
               name="6"
-              v-if="status == '5' && powers.some((item) => item == '032')"
+              v-if="
+                status == '5' &&
+                powers.some((item) => item == '032') &&
+                sitem.sendtype === '1'
+              "
             >
               <wsm-in-order-return-form
                 v-if="newTime !== ''"
@@ -177,7 +191,6 @@
    <script>
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
-import wsmInOrderAddEditForm from "./components/wsm-in-order-addEdit-form";
 import wsmInOrderRecordForm from "./components/wsm-in-order-record-form";
 import wsmInOrderCheckForm from "./components/wsm-in-order-check-form";
 import wsmInOrderReturnForm from "./components/wsm-in-order-return-form";
@@ -187,7 +200,6 @@ export default {
   name: "wsmInOrderDetail",
   mixins: [resToken],
   components: {
-    wsmInOrderAddEditForm,
     wsmInOrderRecordForm,
     wsmInOrderCheckForm,
     wsmInOrderReturnForm,
@@ -210,19 +222,18 @@ export default {
       activeTabs: "1",
       orderCode: "",
       ShowDataTableColumns: ShowDataTableColumns,
-      activeNames: ["0", "1", "2", "3", "4", "5", "6"],
+      activeNames: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10"],
       order_type_options,
       sitem: null,
       status: "",
       statusOptions: [
-        // { value: "0", label: "取消" },
         {
           value: "0",
           label: "待发货",
         },
         {
           value: "1",
-          label: "待验货",
+          label: "待验货", //029
         },
         {
           value: "2",
@@ -234,12 +245,16 @@ export default {
         },
         {
           value: "4",
-          label: "无退货入库成功",
+          label: "入库完成",
+        },
+        {
+          value: "5", //30  || 32
+          label: "退货待物流",
+        },
+        {
+          value: "6",
+          label: "退货完成",
         },
-        // {
-        //   value: "5",
-        //   label: "退货成功",
-        // },
       ],
       statusList: [
         {
@@ -313,7 +328,7 @@ export default {
       if (res && res.code === 0 && res.data) {
         this.sitem = res.data;
         const { status, can, wsm_in_code } = this.sitem;
-        this.status = status;
+        this.status = "1";
         this.orderCode = wsm_in_code;
         if (can && can.length > 0) {
           this.sitem.class_cat = "";

src/views/purchaseIn/wsmInOrder/index.vue

@@ -118,9 +118,9 @@
                 >
                   <el-option
                     v-for="item in statusOptions"
-                    :key="'status' + item.code"
+                    :key="'status' + item.value"
                     :label="item.label"
-                    :value="item.code"
+                    :value="item.value"
                   />
                 </el-select>
               </el-col>
@@ -197,7 +197,7 @@
             :type="scope.row.status == '0' ? 'warning' : ''"
             v-text="
               (
-                statusOptions.find((item) => item.code == scope.row.status) ||
+                statusOptions.find((item) => item.value == scope.row.status) ||
                 {}
               ).label || '--'
             "
@@ -231,7 +231,7 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 
 import asyncRequest from "@/apis/service/purchaseIn/wsmInOrder";
-import { order_type_options,  } from "@/views/purchaseIn/purchaseOrder/columns";
+import { order_type_options } from "@/views/purchaseIn/purchaseOrder/columns";
 import columns from "./columns"; //表格列参数
 import { mapGetters } from "vuex";
 
@@ -269,23 +269,34 @@ export default {
       // 状态
       statusOptions: [
         {
-          code: "0",
-          label: "待同意发货",
+          value: "0",
+          label: "待发货",
         },
         {
-          code: "1",
-          label: "待发货",
+          value: "1",
+          label: "待验货",
         },
         {
-          code: "2",
-          label: "部分发货",
+          value: "2",
+          label: "待审核",
         },
         {
-          code: "3",
-          label: "发货完成",
+         value: "3",
+          label: "待入库",
+        },
+         {
+         value: "4",
+          label: "入库完成",
+        },
+         {
+          value: "5",
+          label: "退货待物流",
+        },
+           {
+          value: "6",
+          label: "退货完成",
         },
       ],
-
       loading: false,
       showModel: false,
       isDetail: false,

src/views/sellOut/bargainList/columns.js

@@ -310,17 +310,13 @@ const listCol = [
   {
     prop: "bargainNo",
     label: "议价编号",
-    width: "160"
-  },
-  {
-    prop: "bidsNo",
-    label: "采返商品编号",
-    width: "160"
+    width: "155"
   },
+
   {
     prop: "zxNo",
     label: "咨询单编号",
-    width: "160"
+    width: "155"
   },
 
   {
@@ -329,6 +325,11 @@ const listCol = [
     _slot_: "status",
     width: "120px",
   },
+  {
+    prop: "bidsNo",
+    label: "采返商品编号",
+    width: "155"
+  },
   {
     prop: "good_img",
     label: "图片",
@@ -338,17 +339,9 @@ const listCol = [
   {
     prop: "good_name",
     label: "商品名称",
-    "min-width": "150"
-  },
-
-
-  {
-    prop: "specinfo",
-    label: "规格",
-    _slot_: "specinfo",
-    "min-width": "125"
+    _slot_: "good_name",
+    "min-width": "180"
   },
-
   {
     prop: "can",
     label: "分类",

src/views/sellOut/bargainList/index.vue

@@ -134,16 +134,26 @@
             :size="tablebtnSize"
             :type="scope.row.status == '0' ? 'warning' : ''"
             v-text="
-              ( options.find((item) => item.id == scope.row.status) || {})
+              (options.find((item) => item.id == scope.row.status) || {})
                 .label || '--'
             "
           ></el-tag>
         </template>
-          <template #specinfo="{ scope }">
-       <span v-for="(si,sii) in  scope.row.specinfo" :key="si.spec_value_id+sii"> <span v-if="sii!==0">--</span>{{si.spec_name}}[{{si.spec_value_name}}]</span>
+        <template #good_name="{ scope }">
+          <span>{{ scope.row.good_name }}</span>
+          <span
+            v-for="(si, sii) in scope.row.specinfo"
+            :key="si.spec_value_id + sii"
+          >
+            {{ sii == 0 ? "__" : "--" }}{{ si.spec_name }}[{{
+              si.spec_value_name
+            }}]</span
+          >
         </template>
-          <template #can="{ scope }">
-       <span v-for="(si,sii) in  scope.row.can" :key="si.id+sii"> <span v-if="sii!==0">_</span>{{si.name}}</span>
+        <template #can="{ scope }">
+          <span v-for="(si, sii) in scope.row.can" :key="si.id + sii">
+            <span v-if="sii !== 0">_</span>{{ si.name }}</span
+          >
         </template>
         <template #operation="{ scope }">
           <el-tooltip
@@ -208,9 +218,9 @@ export default {
         { id: "6", label: "财务主管驳回" },
         { id: "7", label: "已取消议价" },
       ],
-   
+
       sitem: null,
-    
+
       loading: true,
       showModel: false,
       isDetail: false,
@@ -247,8 +257,7 @@ export default {
       },
       // 表格 - 列参数
       columns: listCol,
-  
- 
+
       resultValue: "", //处理结果
     };
   },

src/views/sellOut/project/components/addForm.vue

@@ -277,7 +277,7 @@ export default {
       platform_name: "",
       ruleForm: {
         name: "",
-        platform: [],
+        platform: "",
         companyNo: "",
         khNo: [],
         customer_name: "",
@@ -420,11 +420,9 @@ export default {
     },
     //平台选择
     platform_codesearchChange(e) {
-      if (e) {
         const { id, code, label } = e;
         this.ruleForm.platform = id||"";
         this.$refs.ruleForm.validateField("platform");
-      }
     },
     //销售方公司选择
     company_idsearchChange(e) {
@@ -468,7 +466,7 @@ export default {
       this.company = "";
       this.ruleForm = {
         name: "",
-        platform: [],
+        platform: "",
         companyNo: "",
         khNo: [],
         customer_name: "",
@@ -508,7 +506,7 @@ export default {
           this.platform_name = platform_name || "";
           this.ruleForm = {
             name: project_name || "",
-            platform: platform_id ? [platform_id] : [],
+            platform: platform_id ||"",
             companyNo: companyNo || "",
             khNo: khNo ? [khNo] : [],
             customer_name: khName || "",
@@ -539,7 +537,7 @@ export default {
           console.log(model);
           const { budget_total, ladder } = model;
           let ztotal = Math.floor(budget_total * 100) / 100;
-          model.platform = model.platform.toString();
+          // model.platform = model.platform.toString();
           model.khNo = model.khNo.toString();
           delete model["customer_name"];
           if (ladder && ladder.length < 2) {

src/views/sellOut/project/components/backGoodShow.vue

@@ -106,13 +106,21 @@
                 />
               </div>
             </template>
+            <template #good_name="{ scope }">
+              <span>{{ scope.row.good_name }}</span>
+              <span v-for="(si, sii) in scope.row.specinfo" :key="si.id + sii">
+                {{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{
+                  si.spec_value_name
+                }}]
+              </span>
+            </template>
 
             <template #source="{ scope }">
               <el-tag
                 :size="'mini'"
-                :type="scope.row.source === '1' ? 'success' : ''"
+                :type="scope.row.data_source === '1' ? 'success' : ''"
                 >{{
-                  scope.row.source === "1" ? "线上商品" : "采反商品"
+                  scope.row.data_source === "1" ? "平台商品" : "采反商品"
                 }}</el-tag
               >
             </template>
@@ -122,7 +130,7 @@
                 effect="dark"
                 content="删除"
                 placement="top"
-                v-if="scope.row.data_source === '1' && status === '1'"
+                v-if="scope.row.data_source === '1' && status === '2'"
               >
                 <i
                   class="el-icon-delete tb-icon"

src/views/sellOut/project/components/buyGoodModal.vue

@@ -19,6 +19,7 @@
         <el-col :span="24">
           <show-data-table
             style="margin: 0; padding: 0"
+            border
             :newTime="newTime"
             v-if="newTime !== '' && sitem"
             :sitem="sitem"
@@ -26,8 +27,8 @@
           />
         </el-col>
         <el-col :span="24" style="padding: 10px 0 0 0">
-          <span>商品下单：</span>
-          <el-button-group :size="'mini'" class="fr" style="margin: 8px 0 0 0">
+          <span style="line-height: 30px">商品下单：</span>
+          <el-button-group :size="'mini'" class="fr" style="margin: 0 0 8px 0">
             <el-button
               class="fr"
               type="primary"
@@ -84,19 +85,20 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column
-              prop="good_name"
-              label="商品名称"
-              min-width="120"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="model"
-              label="规格"
-              width="120"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="good_name" label="商品名称" min-width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.good_name }}</span>
+                <span
+                  v-for="(si, sii) in scope.row.specinfo"
+                  :key="si.id + sii"
+                >
+                  {{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{
+                    si.spec_value_name
+                  }}]
+                </span>
+              </template>
             </el-table-column>
+
             <el-table-column
               prop="brand_name"
               label="品牌"
@@ -532,8 +534,8 @@ export default {
       }
       let isedit = false;
       order_addr.forEach((e) => {
+        ta += e.receipt_quantity * 1;
         if (e.edit) {
-          ta += e.receipt_quantity * 1;
           isedit = true;
         }
       });
@@ -546,13 +548,11 @@ export default {
         return;
       }
 
-      console.log(this.sendtype);
       this.project_list[this.index].order_good[0].sendtype = this.sendtype;
       this.project_list[this.index].order_addr =
         this.addrForm.order_addr.length === 0
           ? []
           : JSON.parse(JSON.stringify(this.addrForm.order_addr));
-      console.log(this.project_list[this.index].order_good[0].sendtype);
       if (this.index + 1 === this.total) {
         this.submitForm();
       } else {

src/views/sellOut/project/components/columnsForm.js

@@ -26,19 +26,15 @@ export default [
     {
         prop: "good_name",
         label: "商品名称",
-        "min-width": '110px'
+        _slot_: "good_name",
+        "min-width": '200px'
     },
     {
         prop: "class_cat",
         label: "商品分类",
         "min-width": '110px'
     },
-    {
-        prop: "model",
-        label: "规格",
-        "min-width": '110px'
-    },
- 
+  
     {
         prop: "source",
         label: "商品来源",

src/views/sellOut/project/components/setPlan.vue

@@ -106,17 +106,21 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="good_name"
-            label="商品名称"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="good_name" label="商品名称" min-width="120">
+            <template slot-scope="scope">
+              <span>{{ scope.row.good_name }}</span>
+              <span v-for="(si, sii) in scope.row.specinfo" :key="si.id + sii">
+                {{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{
+                  si.spec_value_name
+                }}]
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="class_cat"
             label="商品分类"
             show-overflow-tooltip
           />
-          <el-table-column prop="model" label="规格" show-overflow-tooltip />
           <el-table-column
             prop="expiry_day"
             label="信息有效期"
@@ -139,7 +143,7 @@
       </div>
       <div class="project-setPlan-title">
         项目方案
-        <span v-if="total !== 0 && table_type === 'list'"
+        <span style="margin:0 0 0 50px;font-size:13px;color:#e4393c" v-if="total !== 0 && table_type === 'list'"
           >{{ plan_show.status === "1" ? "已选定" : "" }}方案总金额：{{
             plan_show.sale_total
           }}元</span
@@ -315,17 +319,21 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="good_name"
-            label="商品名称"
-            show-overflow-tooltip
-          />
+          <el-table-column prop="good_name" label="商品名称" min-width="120">
+            <template slot-scope="scope">
+              <span>{{ scope.row.good_name }}</span>
+              <span v-for="(si, sii) in scope.row.specinfo" :key="si.id + sii">
+                {{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{
+                  si.spec_value_name
+                }}]
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="class_cat"
             label="商品分类"
             show-overflow-tooltip
           />
-          <el-table-column prop="model" label="规格" show-overflow-tooltip />
           <el-table-column
             prop="expiry_day"
             label="信息有效期"
@@ -362,7 +370,7 @@ import columnsForm from "./columnsForm";
 import buyGoodModal from "./buyGoodModal";
 export default {
   name: "setPlan",
-  props: ["showModel", "sitem", "id", "type",'newTime'],
+  props: ["showModel", "sitem", "id", "type", "newTime"],
   mixins: [resToken],
   components: {
     buyGoodModal,
@@ -387,7 +395,7 @@ export default {
     //     this.initForm();
     //   }
     // },
-        newTime: function (val) {
+    newTime: function (val) {
       if (val) {
         this.initForm();
       }
@@ -469,7 +477,7 @@ export default {
     add_plan() {
       const { low_rate } = this.sitem;
       let r = low_rate ? low_rate : "0";
-      if (r === 0) {
+      if (r * 100 === 0) {
         this.$message.warning("暂无项目毛利率，不能制定方案！");
         return;
       }

src/views/sellOut/project/detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="projectDetail">
-    <div>{{powers}}</div>
+    <!-- <div>{{powers}}</div> -->
     <div
       class="projectDetail-main"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '007')"
@@ -80,6 +80,7 @@
             :type="queryType"
             :sitem="sitem"
             @refresh="initForm()"
+            @resGoodOk="initForm()"
           />
         </el-tab-pane>
 

src/views/sellOut/salesOrder/components/order-out-table.vue

@@ -20,7 +20,7 @@
         show-overflow-tooltip
         prop="send_status"
         label="状态"
-        width="80"
+        width="100"
       >
         <template slot-scope="scope">
           <el-tag
@@ -83,22 +83,17 @@
         label="发货时间"
         width="145"
       />
-      <el-table-column
-        fixed="right"
-        width="50"
-        v-if="
-          ((status === '0' || status === '1') &&
-            powers.some((item) => item == '048')) ||
-          powers.some((item) => item == '007')
-        "
-      >
+      <el-table-column fixed="right" width="100">
         <template slot="header" slot-scope="scope">
+          <span>操作</span>
           <el-tooltip
             style="margin: 3px 0 0 0"
             effect="dark"
+            class="fr"
             v-if="
               (status === '0' || status === '1') &&
-              powers.some((item) => item == '048')
+              powers.some((item) => item == '048') &&
+              sitem.send_type !== '1'
             "
             content="添加"
             placement="top"
@@ -109,7 +104,20 @@
               @click="openHouseModal()"
             ></i>
           </el-tooltip>
-          <span v-else>操作</span>
+
+          <el-tooltip
+            style="margin: 3px 0 0 0"
+            effect="dark"
+            content="退货"
+            class="fr"
+            placement="top"
+          >
+            <i
+              class="el-icon-delete tb-icon"
+              style="color: #63cbe7; magin: 0 0 0 10px"
+              @click="openModal()"
+            ></i>
+          </el-tooltip>
         </template>
 
         <template slot-scope="scope">
@@ -136,6 +144,16 @@
       @refresh="refresh"
       @closeModel="closeModel"
     />
+
+    <add-model
+      :id="returnId"
+      :sitem="returnItem"
+      :show-model="returnModel"
+      :is-detail="false"
+      @refresh="refresh"
+      @cancel="returnModel = false"
+    />
+
     <!-- <add-edit
       :id="modelId"
       :sitem="s_sitem"
@@ -151,14 +169,14 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/salesOrder/detail";
 import outOrderAddModel from "./out-order-add-model";
-
+import addModel from "@/views/sellOut/sellReturn/components/addModel";
 import { mapGetters } from "vuex";
 
 export default {
   name: "salesOrderDetail",
   mixins: [mixinPage, resToken],
   props: ["newTime", "id", "sitem"],
-  components: { outOrderAddModel },
+  components: { outOrderAddModel, addModel },
   watch: {
     newTime: function (val) {
       if (val) {
@@ -186,13 +204,14 @@ export default {
     return {
       orderCode: "",
       outCode: "",
+      is_all: false,
       // 状态
       statusOptions: [
-               { id: "0", label: "待发货" },
+        { id: "0", label: "待公司采购" },
         { id: "1", label: "待库管发货" },
         { id: "2", label: "待收货" },
         { id: "3", label: "已收货" },
-        { id: "4", label: "已全部退货" }
+        { id: "4", label: "已全部退货" },
       ],
       showGoodsModel: false,
       stock_code: "",
@@ -204,6 +223,9 @@ export default {
       modelId: "",
       modelItem: null,
       s_sitem: null,
+      returnId: "",
+      returnItem: null,
+      returnModel: false,
     };
   },
   mounted() {
@@ -231,7 +253,10 @@ export default {
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
-        const { addrs, status } = this.sitem;
+        const { addrs, status, wsend_num, send_type } = this.sitem;
+        console.log(send_type);
+        let wsall = wsend_num * 1;
+
         this.status = status;
         console.log(this.status);
         this.tableData = JSON.parse(JSON.stringify(addrs));
@@ -263,12 +288,6 @@ export default {
       }
     },
 
-    openHouseModal() {
-      this.modelId = "add";
-      this.modelItem = this.sitem;
-      this.modelShowModel = true;
-    },
-
     //省市区保存某一行
     checkRow(rowIndex) {
       this.$refs.addrForm.validate((valid) => {
@@ -321,10 +340,16 @@ export default {
         }
       });
     },
-    openModal(code, sitem, outcode) {
-      this.s_sitem = sitem;
-      this.modelId = code;
-      this.showModel = true;
+    openHouseModal() {
+      this.modelId = "add";
+      this.modelItem = this.sitem;
+      this.modelShowModel = true;
+    },
+    openModal() {
+      this.returnId = "add";
+      this.returnItem = this.sitem;
+      this.returnModel = true;
+      console.log(addModel);
     },
   },
 };

src/views/sellOut/salesOrder/detail.vue

@@ -7,14 +7,14 @@
       <div style="height: 30px">
         <span>订单编号：</span><span v-if="sitem">{{ sitem.orderCode }}</span>
         <!-- v-if="status === '4' && powers.some((item) => item == '051')" -->
-        <el-button
+        <!-- <el-button
           style="margin: 0 0 0 10px"
           class="fr"
           type="primary"
           :size="'mini'"
           @click="openModal()"
           >新建销售退货单
-        </el-button>
+        </el-button> -->
         <el-button
           style="margin: 0 0 0 10px"
           class="fr"
@@ -143,14 +143,7 @@
           />
         </el-tab-pane>
       </el-tabs>
-      <add-model
-        :id="modelId"
-        :sitem="s_sitem"
-        :show-model="showModel"
-        :is-detail="isDetail"
-        @refresh="searchList"
-        @cancel="showModel = false"
-      />
+   
       <!-- <edit-add
         :id="modelId"
         :sitem="sitem"
@@ -177,14 +170,14 @@ import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/salesOrder/detail";
 import addForm from "./components/addForm";
 import orderOutTable from "./components/order-out-table";
-import addModel from "@/views/sellOut/sellReturn/components/addModel";
+
 import { showColumns } from "./components/ShowDataTableColumns";
 import setPartial from "./setPartial";
 export default {
   name: "salesOrderDetail",
   mixins: [mixinPage, resToken],
   components: {
-    addModel,
+
     addForm,
     orderOutTable,
     setPartial,
@@ -222,7 +215,7 @@ export default {
         { value: "3", label: "订单已取消" },
       ],
       sitem: null,
-      s_sitem: null,
+   
       orderCode: "",
       status: "",
       newTime: "",
@@ -325,11 +318,7 @@ export default {
       }
       this.loading = false;
     },
-    openModal() {
-      this.modelId = "add";
-      this.s_sitem = this.sitem;
-      this.showModel = true;
-    },
+ 
   },
 };
 </script>

src/views/sellOut/sellReturn/components/addModel.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="title"
+    :title="'新建退货单'"
     :center="true"
     align="left"
     top="5vh"
@@ -14,80 +14,205 @@
     element-loading-background="rgba(0, 0, 0, 0.8)"
   >
     <el-card style="margin: -20px 0 0 0">
-      <add-form
-        v-if="showModel"
-        :showModel="showModel"
-        :sitem="sitem"
-        :id="id"
-        :isDetail="isDetail"
-        @closeModel="handClick"
-        @refresh="refresh"
-      />
+      <el-row :gutter="10">
+        <el-col :span="24">
+          <el-form
+            :model="ruleForm"
+            status-icon
+            :rules="rulesThis"
+            ref="ruleForm"
+            :size="'mini'"
+            label-width="80px"
+            class="demo-ruleForm"
+          >
+            <el-row :gutter="10">
+              <el-col :span="8">
+                <el-form-item label="退货类型" prop="return_type">
+                  <el-select
+                    v-model="ruleForm.return_type"
+                    style="width: 100%"
+                    placeholder="退货类型"
+                  >
+                    <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="退货原因" prop="errorCode">
+                  <abnormal-cause
+                    :value="ruleForm.errorCode"
+                    :placeholder="'退货原因'"
+                    :type="'5'"
+                    :size="'mini'"
+                    @searchChange="errorCode_change"
+                  />
+                </el-form-item> </el-col
+              ><el-col :span="16">
+                <el-form-item label="退货备注" prop="remark">
+                  <el-input
+                    :disabled="isDetail"
+                    type="textarea"
+                    :rows="3"
+                    maxlength="250"
+                    show-word-limit
+                    placeholder="请填写备注"
+                    v-model="ruleForm.remark"
+                  /> </el-form-item></el-col
+            ></el-row>
+
+            <el-form-item label="收货信息" :size="'mini'" required>
+              <el-table
+                :data="tableForm.get_product_go"
+                border
+                :size="'mini'"
+                row-key="key"
+                max-height="300px"
+              >
+                <el-table-column
+                  label="收货人-联系电话-地址"
+                  min-width="300"
+                  show-overflow-tooltip
+                >
+                  <template slot-scope="scope">
+                    {{ scope.row.contactor }}-{{ scope.row.mobile }}-{{
+                      scope.row.addr_info
+                    }}{{ scope.row.addr }}
+                  </template></el-table-column
+                >
+                <el-table-column
+                  label="收货总数量"
+                  prop="receipt_quantity"
+                  width="100"
+                />
+
+                <el-table-column label="退货数量" width="150">
+                  <template slot-scope="scope">
+                    <el-form-item style="margin: 0" :size="'mini'">
+                      <el-input-number
+                        size="mini"
+                        v-model="scope.row.return_num"
+                        :disabled="!scope.row.edit"
+                        :min="0"
+                        :max="scope.row.wsend_num"
+                        :precision="0"
+                      />
+                    </el-form-item>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="未发货数量"
+                  prop="wsend_num"
+                  width="90"
+                />
+                <el-table-column
+                  label="已发货数量"
+                  prop="send_num"
+                  width="90"
+                />
+
+                <el-table-column fixed="right" label="操作" width="50">
+                  <template slot-scope="scope">
+                    <el-tooltip
+                      effect="dark"
+                      content="编辑"
+                      v-if="!scope.row.edit"
+                      placement="top"
+                    >
+                      <i
+                        class="el-icon-edit tb-icon"
+                        @click="editRow(scope.$index, 1)"
+                      ></i>
+                    </el-tooltip>
+
+                    <el-tooltip
+                      effect="dark"
+                      content="保存"
+                      v-if="scope.row.edit"
+                      placement="top"
+                    >
+                      <i
+                        class="el-icon-circle-check tb-icon"
+                        @click="checkRow(scope.$index, 1)"
+                      ></i>
+                    </el-tooltip>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-form-item>
+          </el-form>
+        </el-col>
+        <el-col :span="24" style="text-align: right">
+          <el-button type="primary" @click="submitForm" :size="'mini'"
+            >保 存
+          </el-button>
+          <el-button
+            @click="showModelThis = false"
+            v-if="!isDetail"
+            :size="'mini'"
+            >关 闭</el-button
+          >
+        </el-col>
+      </el-row>
     </el-card>
   </el-dialog>
 </template>
    <script>
 import asyncRequest from "@/apis/service/sellOut/sellReturn";
 import resToken from "@/mixins/resToken";
-import addForm from "./addForm";
-import { isMobile } from "@/utils/validate";
+import { isnumber } from "@/utils/validate";
 export default {
-  components: {   addForm },
   name: "sellReturn",
   props: ["showModel", "id", "isDetail", "sitem"],
   mixins: [resToken],
   data() {
-    const validatemobile = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("手机号不能为空！"));
-      } else {
-        if (!isMobile(value)) {
-          callback(new Error("手机号格式不正确！"));
-        } else {
-          callback();
-        }
-      }
-    };
     return {
-      noSendNumbers: "", //收货-未发货数量
-      noSendNum: "", //销售-未发货数量
-      reason_options: [], //退换货原因备选项
       loading: false,
-      title: "添加销售退货单",
       showModelThis: this.showModel,
       ruleForm: {
-        get_return_num: "",
-        outCode: "", //发货申请单编号
-        return_remark: "", //退货备注
-        return_num: "", //退货数量
-        returnReason: [], //退货原因
+        return_type: "0",
+        orderCode: "", //发货申请单编号
+        remark: "", //退货备注
+        errorCode: "", //退货原因
       },
       rulesThis: this.rules,
+      options: [
+        {
+          value: "1",
+          label: "无地址",
+        },
+        {
+          value: "2",
+          label: "有地址",
+        },
+      ],
       rules: {
-        returnReason: [
+        errorCode: [
           {
             required: true,
             message: "请选择退货原因",
             trigger: "change",
           },
         ],
-        return_num: [
+        remark: [
           {
             required: true,
-            validator: validatemobile,
+            message: "请输入退货备注",
             trigger: "blur",
           },
         ],
-        return_remark: [
+        return_type: [
           {
             required: true,
-            message: "请输入退货备注",
-            trigger: "blur",
+            message: "请选择退货类型",
+            trigger: "change",
           },
         ],
       },
       tableForm: {
-        product_go: [],
         get_product_go: [],
       },
     };
@@ -107,13 +232,14 @@ export default {
   },
 
   methods: {
+    errorCode_change(e) {
+      this.ruleForm.errorCode = e && e.code ? e.code : "";
+      this.$refs.ruleForm.validateField("errorCode");
+    },
     async initForm() {
       this.loading = true;
-      this.title = "添加销售退货单";
-      // this.rulesThis = this.rules;
-      // await this.resetForm();
-      // this.getReason(); //获取退还货原因
-
+      this.rulesThis = this.rules;
+      await this.resetForm();
       this.loading = false;
     },
     async resetForm() {
@@ -122,30 +248,30 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          this.outCode = this.sitem.orderCode;
-          const { info, addrs } = this.sitem;
-          info.forEach((ele) => {
-            this.noSendNum += ele.wsend_num;
-          });
-          let list = JSON.parse(JSON.stringify(info)); //
+          const { info, addrs, orderCode } = this.sitem;
+          console.log(this.sitem);
+          let list =
+            info && info.length > 0 ? JSON.parse(JSON.stringify(info)) : []; //
           list.map((v) => {
             v.edit = false;
+            v.return_num = v.return_num || "0";
             return v;
           });
-          this.tableForm.product_go = [].concat(...list);
-          addrs.forEach((ele) => {
-            this.noSendNumbers += ele.wsend_num;
-          });
-          let l_list = JSON.parse(JSON.stringify(addrs));
+          let l_list =
+            addrs && addrs.length > 0 ? JSON.parse(JSON.stringify(addrs)) : [];
           l_list.map((ele) => {
             ele.edit = false;
+            ele.return_num = ele.return_num || "0";
             return ele;
           });
-          this.tableForm.get_product_go = [].concat(...l_list);
           this.ruleForm = {
-            return_remark: "", //退货备注
-            return_num: "", //退货数量
-            returnReason: [], //退货原因
+            orderCode: orderCode || "",
+            return_type:"1",
+            remark: "", //退货备注
+            errorCode: "", //退货原因
+          };
+          this.tableForm = {
+            get_product_go: [].concat(...l_list),
           };
         }
       });
@@ -155,45 +281,42 @@ export default {
       await this.$refs.ruleForm.validate(async (valid) => {
         if (valid) {
           this.loading = true;
-          const model = JSON.parse(JSON.stringify(this.ruleForm));
-          let arr = JSON.parse(JSON.stringify(this.tableForm.product_go));
-          //收货信息列表入参
-          let list = [];
-          arr.map((e) => {
-            let obj = {
-              wsm_code: e.wsm_code,
-              return_num: model.return_num,
-            };
-            list.push(obj);
-          });
-          // 地址列表入参
+          let model = JSON.parse(JSON.stringify(this.ruleForm));
           let arr1 = JSON.parse(JSON.stringify(this.tableForm.get_product_go));
+          let wsm_code_edit = false,
+            addr_edit = false,
+            wsm_code_total = 0,
+            addr_total = 0;
+
           let addr = [];
-          arr1.map((e) => {
+          arr1.forEach((e) => {
+            if (e.edit) {
+              addr_edit = true;
+            }
             let obj = {
               addrid: e.id,
-              return_num: model.num,
+              return_num: e.return_num,
             };
+            addr_total += e.return_num;
             addr.push(obj);
           });
-          let _model = {
-            orderCode: model.outCode,
-            errorCode: model.errorCode,
-            remark: model.return_remark,
-            list,
-            addr,
-          };
-          if (model.return_num > this.noSendNum) {
-            this.$message.warning("退货数量不能大于未发货数量");
+          model.addr = addr;
+          if (wsm_code_edit) {
+            this.$message.warning("仓库信息正在编辑，请保存后再试！");
+            this.loading = false;
             return;
           }
-          let res = {};
-          if (this.id === "add") {
-            delete model["id"];
-            res = await asyncRequest.add(_model);
-          } else {
-            res = await asyncRequest.update(_model);
+          if (addr_edit) {
+            this.$message.warning("地址信息正在编辑，请保存后再试！");
+            this.loading = false;
+            return;
+          }
+          if (wsm_code_total !== addr_total) {
+            this.$message.warning("仓库退货总数不等于收货地址总数！");
+            this.loading = false;
+            return;
           }
+          let res = await asyncRequest.add(model);
           this.loading = false;
           if (res && res.code === 0) {
             const title = this.id === "add" ? "添加成功" : "修改成功";
@@ -203,7 +326,7 @@ export default {
             });
             this.showModelThis = false;
             // 刷新
-            this.$emit("refresh");
+            this.$emit("refresh", false);
           } else if (res && res.code >= 100 && res.code <= 104) {
             await this.logout();
           } else {
@@ -215,396 +338,36 @@ export default {
         }
       });
     },
-    //异常原因筛选
     //保存某一行
-    checkRow(rowIndex, name) {
-      if (name == "return") {
-        const model = JSON.parse(JSON.stringify(this.ruleForm));
-        if (Number(model.return_num) > Number(this.noSendNum)) {
-          this.$message.warning("退货数量不能大于未发货数量");
+    checkRow(rowIndex, type) {
+      if (type === 1) {
+        const { wsend_num, return_num } =
+          this.tableForm.get_product_go[rowIndex];
+        if (!isnumber(return_num)) {
+          this.$message.warning("退货数量不规范！");
           return;
         }
-        const { check_value, check_remark } =
-          this.tableForm.product_go[rowIndex];
-        if (check_value != "" && check_remark != "") {
-          this.tableForm.product_go[rowIndex].edit = false;
-        } else {
-          this.$message.warning("审核情况或审核备注不能为空");
-        }
-      } else if (name == "get") {
-        const model = JSON.parse(JSON.stringify(this.ruleForm));
-        if (Number(model.get_return_num) > Number(this.noSendNum)) {
-          this.$message.warning("退货数量不能大于未发货数量");
+        if (parseInt(wsend_num) < parseInt(return_num)) {
+          this.$message.warning("退货数量不能大于未发货总数量！");
           return;
         }
-        const { check_value, check_remark } =
-          this.tableForm.get_product_go[rowIndex];
-        if (check_value != "" && check_remark != "") {
-          this.tableForm.get_product_go[rowIndex].edit = false;
-        } else {
-          this.$message.warning("审核情况或审核备注不能为空");
-        }
+        this.tableForm.get_product_go[rowIndex].edit = false;
       }
     },
     //编辑某一行
-    editRow(rowIndex, name) {
-      if (name == "return") {
-        let index = this.tableForm.product_go.findIndex((v) => {
-          v.edit;
-        });
-        if (index !== -1) {
-          this.$message.warning("请完成其他行的编辑！");
-          return;
-        } else {
-          this.tableForm.product_go[rowIndex].edit = true;
-        }
-      } else if (name == "get") {
-        let index = this.tableForm.product_go.findIndex((v) => {
-          v.edit;
-        });
-        if (index !== -1) {
-          this.$message.warning("请完成其他行的编辑！");
-          return;
-        } else {
-          this.tableForm.get_product_go[rowIndex].edit = true;
-        }
+    editRow(rowIndex, type) {
+      let list = JSON.parse(JSON.stringify(this.tableForm.get_product_go));
+      let index = list.findIndex((v) => {
+        v.edit;
+      });
+      if (index !== -1) {
+        this.$message.warning("请完成其他行的编辑！");
+        return;
       }
-    },
-    resetRow(rowIndex) {
-      this.tableForm.product_go[rowIndex].check_remark = "";
-      this.tableForm.product_go[rowIndex].check_value = "agree";
-    },
-    handClick(e) {
-      this.showModelThis = e;
-    },
-    refresh(e) {
-      this.showModelThis = e;
-      this.$emit("refresh", true);
+      this.tableForm.get_product_go[rowIndex].edit = true;
     },
   },
 };
-/**
- *  <el-row :gutter="10">
-        <el-col :span="24">
-          <el-form
-            :model="ruleForm"
-            status-icon
-            :rules="rulesThis"
-            ref="ruleForm"
-            label-width="110px"
-            class="demo-ruleForm"
-          >
-            <el-form-item
-              label="退货原因"
-              prop="returnReason"
-              v-if="id === 'add' || isDetail"
-            >
-              <el-select
-                style="width: 100%"
-                v-model="ruleForm.returnReason"
-                placeholder="退换货原因"
-              >
-                <el-option
-                  v-for="item in reason_options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-
-            <el-form-item label="退货备注" prop="return_remark">
-              <!-- <el-input v-model="ruleForm.tel" :disabled="isDetail"></el-input> -->
-              <el-input
-                type="textarea"
-                maxlength="250"
-                show-word-limit
-                placeholder="请填写备注"
-                v-model="ruleForm.return_remark"
-              />
-            </el-form-item>
-            <el-form-item label="仓库信息">
-              <el-table
-                :data="tableForm.product_go"
-                border
-                :size="'mini'"
-                row-key="key"
-              >
-                <el-table-column label="商品总数量" width="100">
-                  <template slot-scope="scope">
-                    <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                    <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                      <p>{{ scope.row.num }}</p>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column label="已发货数量" width="100">
-                  <template slot-scope="scope">
-                    <!-- :prop="'product_go.' + scope.$index + '.send_num'" -->
-                    <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                      <p>
-                        {{ scope.row.send_num }}
-                      </p>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column label="未发货数量" width="100">
-                  <template slot-scope="scope">
-                    <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                    <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                      <p>{{ scope.row.wsend_num }}</p>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column label="退货数量">
-                  <template slot-scope="scope">
-                    <!-- :prop="'product_go.' + scope.$index + '.return_num'" -->
-                    <el-form-item
-                      :style="!scope.row.edit ? 'margin:0' : ''"
-                      :rules="{
-                        required: true,
-                        message: '退货数量不能为空',
-                        trigger: 'blur',
-                      }"
-                    >
-                      <el-input
-                        :disabled="!scope.row.edit"
-                        v-model="ruleForm.return_num"
-                      ></el-input>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column label="采购编码" width="180">
-                  <template slot-scope="scope">
-                    <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                    <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                      <p>{{ scope.row.orderCode }}</p>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column label="仓库名称" width="150">
-                  <template slot-scope="scope">
-                    <!-- :prop="'product_go.' + scope.$index + '.wsm_name'" -->
-                    <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                      <p>{{ scope.row.wsm_name }}</p>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column label="仓库供应商" width="220">
-                  <template slot-scope="scope">
-                    <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                    <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                      <p>{{ scope.row.wsm_supplier }}</p>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column label="仓库编码" width="200">
-                  <template slot-scope="scope">
-                    <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                    <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                      <p>{{ scope.row.wsm_code }}</p>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-
-                <!-- <el-table-column label="仓库供应商">
-                  <template slot-scope="scope">
-                    <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                      <p>{{ scope.row.wsm_supplierNo }}</p>
-                    </el-form-item>
-                  </template>
-                </el-table-column> -->
-
-                <el-table-column fixed="right" label="操作" width="80">
-                  <template slot-scope="scope">
-                    <el-tooltip
-                      effect="dark"
-                      content="编辑"
-                      v-if="!scope.row.edit"
-                      placement="top"
-                    >
-                      <i
-                        class="el-icon-edit tb-icon"
-                        @click="editRow(scope.$index, 'return')"
-                      ></i>
-                    </el-tooltip>
-
-                    <el-tooltip
-                      effect="dark"
-                      content="保存"
-                      v-if="scope.row.edit"
-                      placement="top"
-                    >
-                      <i
-                        class="el-icon-circle-check tb-icon"
-                        @click="checkRow(scope.$index, 'return')"
-                      ></i>
-                    </el-tooltip>
-
-                    <el-tooltip effect="dark" content="重置" placement="top">
-                      <i
-                        v-if="scope.row.edit"
-                        class="el-icon-refresh-left tb-icon"
-                        @click="resetRow(scope.$index)"
-                      ></i>
-                    </el-tooltip>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <!-- <el-col
-                :span="24"
-                style="text-align: right; padding: 30px 0 10px 0"
-              >
-                <el-button type="primary" :size="'mini'" @click="submitForm"
-                  >保 存
-                </el-button>
-              </el-col> -->
-            </el-form-item>
-            <el-form-item label="收货信息">
-              <el-table
-                :data="tableForm.get_product_go"
-                border
-                :size="'mini'"
-                row-key="key"
-              >
-                <el-table-column label="收货总数量">
-                  <template slot-scope="scope">
-                    <!-- :prop="'product_go.' + scope.$index + '.send_num'" -->
-                    <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                      <p>
-                        {{ scope.row.receipt_quantity }}
-                      </p>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column label="已发货数量">
-                  <template slot-scope="scope">
-                    <!-- :prop="'product_go.' + scope.$index + '.send_num'" -->
-                    <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                      <p>
-                        {{ scope.row.send_num }}
-                      </p>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column label="未发货数量">
-                  <template slot-scope="scope">
-                    <!-- :prop="'product_go.' + scope.$index + '.wsend_num'" -->
-                    <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                      <p>{{ scope.row.wsend_num }}</p>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column label="退货数量">
-                  <template slot-scope="scope">
-                    <!-- :prop="'product_go.' + scope.$index + '.return_num'" -->
-                    <el-form-item
-                      :style="!scope.row.edit ? 'margin:0' : ''"
-                      :rules="{
-                        required: true,
-                        message: '退货数量不能为空',
-                        trigger: 'blur',
-                      }"
-                    >
-                      <el-input
-                        :disabled="!scope.row.edit"
-                        v-model="ruleForm.get_return_num"
-                      ></el-input>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column label="采购编码" width="200">
-                  <template slot-scope="scope">
-                    <!-- :prop="'product_go.' + scope.$index + '.send_num'" -->
-                    <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                      <p>
-                        {{ scope.row.orderCode }}
-                      </p>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <!-- <el-table-column label="仓库供应商">
-                  <template slot-scope="scope">
-                    <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                      <p>{{ scope.row.wsm_supplierNo }}</p>
-                    </el-form-item>
-                  </template>
-                </el-table-column> -->
-                <el-table-column label="收货联系人 ">
-                  <template slot-scope="scope">
-                    <!-- :prop="'product_go.' + scope.$index + '.wsm_name'" -->
-                    <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                      <p>{{ scope.row.contactor }}</p>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column label="联系方式" width="120">
-                  <template slot-scope="scope">
-                    <!-- :prop="'product_go.' + scope.$index + '.wsm_name'" -->
-                    <el-form-item :style="!scope.row.edit ? 'margin:0' : ''">
-                      <p>{{ scope.row.mobile }}</p>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-
-                <el-table-column fixed="right" label="操作" width="80">
-                  <template slot-scope="scope">
-                    <el-tooltip
-                      effect="dark"
-                      content="编辑"
-                      v-if="!scope.row.edit"
-                      placement="top"
-                    >
-                      <i
-                        class="el-icon-edit tb-icon"
-                        @click="editRow(scope.$index, 'get')"
-                      ></i>
-                    </el-tooltip>
-
-                    <el-tooltip
-                      effect="dark"
-                      content="保存"
-                      v-if="scope.row.edit"
-                      placement="top"
-                    >
-                      <i
-                        class="el-icon-circle-check tb-icon"
-                        @click="checkRow(scope.$index, 'get')"
-                      ></i>
-                    </el-tooltip>
-
-                    <el-tooltip effect="dark" content="重置" placement="top">
-                      <i
-                        v-if="scope.row.edit"
-                        class="el-icon-refresh-left tb-icon"
-                        @click="resetRow(scope.$index)"
-                      ></i>
-                    </el-tooltip>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <!-- <el-col
-                :span="24"
-                style="text-align: right; padding: 30px 0 10px 0"
-              >
-                <el-button type="primary" :size="'mini'" @click="submitForm"
-                  >保 存
-                </el-button>
-              </el-col> -->
-            </el-form-item>
-          </el-form>
-        </el-col>
-        <el-col :span="24" style="text-align: right">
-          <el-button type="primary" @click="submitForm" v-if="!isDetail"
-            >保 存
-          </el-button>
-          <el-button @click="showModelThis = false">{{
-            isDetail ? "关 闭" : "取 消"
-          }}</el-button>
-        </el-col>
-      </el-row>
- */
 </script>
 
 <style lang="scss" scoped>

src/views/sellOut/zixunOrder/detail.vue

@@ -7,6 +7,7 @@
       <show-data-table
         style="padding: 10px 0 5px 0"
         :newTime="newTime"
+        border
         v-if="newTime !== '' && queryType === 'view'"
         :sitem="sitem"
         :columns="editColumns"