暂存

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
@@ -158,7 +124,7 @@
                 </template>
               </show-data-table>
             </el-collapse-item>
-            <el-collapse-item title="商品信息" name="2">
+            <!-- <el-collapse-item title="商品信息" name="2">
               <show-goods-data-table
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -167,7 +133,7 @@
                 :spucode="sitem.spuCode"
                 :iscgd="true"
               />
-            </el-collapse-item>
+            </el-collapse-item> -->
             <el-collapse-item title="入库单" name="3">
               <order-in-table
                 :newTime="newTime"

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

@@ -124,7 +124,7 @@
 <script>
 import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
-import { isnumber, isnumber2, isAlphanumeric } from "@/utils/validate";
+import {  isAlphanumeric } from "@/utils/validate";
 export default {
   name: "wsmInOrderAdd",
   props: ["id", "sitem", "newTime", "modelSitem"],

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

@@ -40,7 +40,6 @@
           @refresh="errorModel"
           @cancel="showModel = false"
         />
-        <!-- <el-button type="primary" @click=""> 新建 </el-button> -->
         <el-form
           :model="tableForm"
           :rules="tableRules"

src/views/purchaseIn/wsmInOrder/detail.vue

@@ -107,7 +107,7 @@
                 :iscgd="true"
               />
             </el-collapse-item>
-            <el-collapse-item title="入库验收" name="3">
+            <el-collapse-item title="入库验收登记" name="3" v-if="sitem.order_type==='1'">
               <wsm-in-order-record-form
                 v-if="newTime !== ''"
                 :id="queryId"
@@ -116,8 +116,7 @@
                 @refresh="initData()"
               />
             </el-collapse-item>
-            <el-collapse-item title="入库验收审核" name="4">
-              <!-- v-if="status !== '4'" -->
+            <el-collapse-item title="入库验收登记审核" name="4">
               <wsm-in-order-check-form
                 v-if="newTime !== ''"
                 :id="queryId"
@@ -210,19 +209,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 +232,16 @@ export default {
         },
         {
           value: "4",
-          label: "无退货入库成功",
+          label: "入库完成",
+        },
+        {
+          value: "5", //30  || 32
+          label: "退货待物流",
+        },
+        {
+          value: "6",
+          label: "退货完成",
         },
-        // {
-        //   value: "5",
-        //   label: "退货成功",
-        // },
       ],
       statusList: [
         {
@@ -313,7 +315,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 || '--'
             "
@@ -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/project/components/backGoodShow.vue

@@ -110,9 +110,9 @@
             <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 +122,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;
         }
       });
@@ -541,6 +543,9 @@ export default {
         this.$message.warning("当前已有地址在编辑，请保存后再试！");
         return;
       }
+      console.log(this.sendtype);
+      console.log(ta);
+      console.log(num);
       if (this.sendtype === "1" && ta !== parseInt(num + "")) {
         this.$message.warning("收货数量总数与购买数量总数不一致！");
         return;

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

@@ -362,7 +362,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 +387,7 @@ export default {
     //     this.initForm();
     //   }
     // },
-        newTime: function (val) {
+    newTime: function (val) {
       if (val) {
         this.initForm();
       }
@@ -469,7 +469,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;
       }