Merge branch 'sit'

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

@@ -28,4 +28,6 @@ export default {
   saleaddother: (data, params) => http(api + "saleaddother", data, "post", params),
   //延时发货追加地址
   saleaddr: (data, params) => http(api + "saleaddr", data, "post", params),
+  // 区编码获取省市区汉字
+  addrall: (data, params) => http(api + "addrall", data, "post", params),
 };

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

@@ -444,7 +444,7 @@ export default {
             });
           }
           this.sitem.cat = cat;
-          this.sitem.good_img = this.sitem.good_img.split(",");
+          // this.sitem.good_img = this.sitem.good_img.split(",");
 
           this.sitem.good_info_img = this.sitem.good_info_img.split(",");
         } else if (code >= 100 && code <= 104) {

src/components/show-good-data-modal/main.vue

@@ -101,7 +101,6 @@
             "
           />
         </template>
-
         <template slot="exam_status">
           <el-tag
             :size="'mini'"
@@ -111,39 +110,6 @@
             "
           />
         </template>
-        <!-- <template slot="purchase">
-          <el-table
-            :data="sitem.nakelist"
-            :size="'mini'"
-            border
-            stripe
-            style="width: 99%; margin: 10px 10px 10px 0"
-          >
-            <el-table-column prop="min_num" label="起订量(>=)" />
-            <el-table-column prop="nake_fee" label="成本合计" />
-            <el-table-column prop="cost_fee" label="工艺费" />
-            <el-table-column prop="delivery_fee" label="物流费" />
-          </el-table>
-        </template> -->
-        <template slot="ladderlist">
-          <el-table
-            :data="sitem.ladderlist"
-            :size="'mini'"
-            border
-            stripe
-            style="width: 99%; margin: 10px 10px 10px 0"
-          >
-            <el-table-column prop="min_num" label="起订量(>=)" />
-            <el-table-column prop="sale_price" label="售价" />
-            <el-table-column prop="market_price" label="市场价" />
-            <el-table-column prop="market_platform" label="对比平台" />
-            <el-table-column prop="status" label="状态">
-              <template slot-scope="scope">{{
-                scope.row.status === "1" ? "启用" : "禁用"
-              }}</template>
-            </el-table-column>
-          </el-table>
-        </template>
       </show-data-table>
     </el-card>
   </el-dialog>
@@ -172,7 +138,7 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
   },
-  props: ["showModel", "id"],
+  props: ["showModel", "spuCode",'skuCode'],
 
   /**
    * 属性集合

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

@@ -281,7 +281,8 @@
     />
     <show-good-data-modal
       :show-model="showGoodModel"
-      :id="showGoodId"
+      :skuCode="showGoodId"
+      :spuCode="''"
       @cancel="showGoodModel = false"
     />
     <el-col

src/views/goodStore/active/components/finance-exam-one-form.vue

@@ -62,7 +62,7 @@
     />
     <show-good-data-modal
       :show-model="showGoodModel"
-      :id="showGoodId"
+      :skuCode="showGoodId"
       @cancel="showGoodModel = false"
     />
     <el-col

src/views/goodStore/active/components/finance-exam-three-form.vue

@@ -148,7 +148,7 @@
     />
     <show-good-data-modal
       :show-model="showGoodModel"
-      :id="showGoodId"
+      :skuCode="showGoodId"
       @cancel="showGoodModel = false"
     />
     <el-col

src/views/goodStore/active/components/finance-exam-two-form.vue

@@ -74,7 +74,7 @@
     />
     <show-good-data-modal
       :show-model="showGoodModel"
-      :id="showGoodId"
+      :skuCode="showGoodId"
       @cancel="showGoodModel = false"
     />
     <el-col

src/views/goodStore/activeGood/index.vue

@@ -173,7 +173,7 @@
       </ex-table>
       <show-good-data-modal
         :show-model="showGoodModel"
-        :id="showGoodId"
+        :skuCode="showGoodId"
         @cancel="showGoodModel = false"
       />
     </div>

src/views/purchaseIn/workbench/components/baseForm.vue

@@ -45,7 +45,7 @@
           <search-brand
             :value="ruleForm.brandid"
             :size="'mini'"
-            :disabled="true"
+            :disabled="false"
             :isDetail="true"
             :names="brand_name"
             :placeholder="'品牌'"
@@ -124,7 +124,7 @@
             :size="'mini'"
             :isDetail="true"
             :names="unit_name"
-            disabled
+            :disabled="false"
             :placeholder="'单位'"
             @searchChange="unitsearchChange"
           />
@@ -140,7 +140,7 @@
                 :placeholder="'分类'"
                 :size="'mini'"
                 :names="cat_id_name"
-                :disabled="true"
+                :disabled="false"
                 :isDetail="true"
                 @searchChange="cat_id_change"
               />
@@ -455,7 +455,7 @@
             <search-metal-kind
               :value="ruleForm.metal_id"
               :size="'mini'"
-              :disabled="true"
+              :disabled="false"
               :isDetail="true"
               :placeholder="'金属种类'"
               @searchChange="metal_idsearchChange"

src/views/purchaseIn/workbench/detail.vue

@@ -22,7 +22,7 @@
                 <li>购买数量：</li>
                 <li>{{ sitem.num }}{{ sitem.unit_name }}</li>
                 <li>预算单价：</li>
-                <li>{{ sitem.budget_price }}元</li>
+                <li>{{ sitem.original_price }}元</li>
                 <li>到货时间：</li>
                 <li>{{ sitem.arrival_time }}</li>
               </ul>
@@ -179,7 +179,7 @@
                   >新建信息</el-tag
                 >
                 <el-tag type="danger" :size="'mini'" v-else
-                  >历史信息，需确认</el-tag
+                  >待确认</el-tag
                 >
               </template></el-table-column
             >

src/views/sellOut/salesOrder/components/ShowDataTableColumns.js

@@ -231,11 +231,11 @@ const showColumns = [
     label: "其他单号",
     span: 12,
   },
-  // {
-  //   prop: "remark",
-  //   label: "备注",
-  //   span: 24,
-  // },
+  {
+    prop: "remark",
+    label: "备注",
+    span: 24,
+  },
 
 ]
 

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

@@ -1092,7 +1092,7 @@ export default {
         this.ruleForm.activity_stock = 0 + "";
       }
       if (!this.priceLoding) {
-        const { isok, price ,stock} = await this.set_salegetprice();
+        const { isok, price, stock } = await this.set_salegetprice();
         this.ruleForm.good_price = isok ? price : "0";
       }
 
@@ -1174,9 +1174,34 @@ export default {
       this.addrForm.order_addr[index].addr_code = e;
     },
     //省市区保存某一行
-    checkRow(rowIndex) {
-      this.$refs.addrForm.validate((valid) => {
+    async checkRow(rowIndex) {
+      await this.$refs.addrForm.validate(async (valid) => {
         if (valid) {
+          const { addr_code } = this.addrForm.order_addr[rowIndex];
+          if (addr_code && addr_code.length === 3) {
+            let arrCode = addr_code[addr_code.length - 1];
+            // console.log(model);
+            let { code, data, message } = await asyncRequest.addrall({
+              code: arrCode,
+            });
+            if (code === 0) {
+              const { province, city, area } = data;
+              let province_name =
+                province && province.name ? province.name : "";
+              let city_name = city && city.name ? city.name : "";
+              let area_name = area && area.name ? area.name : "";
+              this.addrForm.order_addr[rowIndex].addr_code_name =
+                province_name && city_name && area_name
+                  ? `${province_name}/${city_name}/${area_name}`
+                  : "";
+            } else if (code >= 100 && code <= 104) {
+              await this.logout();
+            } else {
+              this.$message.warning(message);
+            }
+          } else {
+            this.addrForm.order_addr[rowIndex].addr_code_name = "";
+          }
           this.addrForm.order_addr[rowIndex].edit = false;
         } else {
           console.log("error submit!!");

src/views/sellOut/sellAfterApply/components/express_feedback.vue

@@ -11,7 +11,7 @@
     class="demo-ruleForm"
   >
     <el-row>
-      <el-col :span="12">
+      <el-col :span="12" v-show="return_tag === '2'">
         <el-form-item label="仓库信息" prop="wsm_supplierNo">
           <search-supplier
             :size="'mini'"
@@ -26,7 +26,7 @@
           />
         </el-form-item>
       </el-col>
-      <el-col :span="10">
+      <el-col :span="12" v-show="return_tag === '2'">
         <el-form-item prop="wsm_code" label-width="10px">
           <search-stock
             :size="'mini'"
@@ -45,49 +45,50 @@
           />
         </el-form-item>
       </el-col>
+
       <el-col
-        :span="2"
-        style="text-align: right"
-        v-if="status === '3' && powers.some((item) => item == '083')"
+        :span="24"
+        v-if="
+          (ruleForm.wsm_code &&
+            ruleForm.wsm_code.length === 1 &&
+            return_tag === '2') ||
+          return_tag == '1'
+        "
       >
-        <el-button type="primary" @click="submitForm" size="mini"
-          >保 存</el-button
-        >
-      </el-col>
-      <el-col v-if="ruleForm.wsm_code && ruleForm.wsm_code.length === 1">
         <el-col :span="12">
-          <el-form-item label="收件人">
+          <el-form-item label="收件人" prop="contactor">
             <el-input
-              disabled
+              :disabled="return_tag === '2'"
               v-model="ruleForm.contactor"
               placeholder="收件人"
             ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="收件人电话">
+          <el-form-item label="收件人电话" prop="mobile">
             <el-input
-              disabled
+              :disabled="return_tag === '2'"
               v-model="ruleForm.mobile"
               placeholder="收件人电话"
             ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="退回地址">
+          <el-form-item label="退回地址" prop="addr_code">
             <select-area
               :placeholder="'省/市/区'"
               :value="ruleForm.addr_code"
               :is-detail="true"
               :size="'mini'"
-              :disabled="true"
+              @selectChange="addr_selectChange"
+              :disabled="return_tag === '2'"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label-width="10px">
+          <el-form-item label-width="10px" prop="addr">
             <el-input
-              disabled
+              :disabled="return_tag === '2'"
               v-model="ruleForm.addr"
               maxlength="250"
               placeholder="退回地址"
@@ -95,23 +96,62 @@
           </el-form-item>
         </el-col>
       </el-col>
+      <el-col
+        :span="24"
+        style="text-align: right; padding: 0 0 15px 0"
+        v-if="status === '3' && powers.some((item) => item == '083')"
+      >
+        <el-button type="primary" @click="submitForm" size="mini"
+          >保 存</el-button
+        >
+      </el-col>
     </el-row>
   </el-form>
 </template>
 <script>
 import asyncRequest from "@/apis/service/sellOut/sellAfterApply";
 import resToken from "@/mixins/resToken";
+import { isMobile, isChinese, isEmoticon } from "@/utils/validate";
 export default {
   name: "sellAfterApplyDetail",
   props: ["id", "newTime", "sitem"],
   mixins: [resToken],
   data() {
+    const validatename = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("收件人不能为空！"));
+      } else {
+        if (value.length < 2 || value.length > 12) {
+          callback(new Error("收件人规则为2~12位汉字！"));
+        } else {
+          if (!isChinese(value)) {
+            callback(new Error("收件人规则为2~12位汉字！"));
+          } else if (isEmoticon(value)) {
+            callback(new Error("收件人规则为2~12位汉字！"));
+          } else {
+            callback();
+          }
+        }
+      }
+    };
+    const validatemobile = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("手机号不能为空！"));
+      } else {
+        if (!isMobile(value)) {
+          callback(new Error("手机号格式不正确！"));
+        } else {
+          callback();
+        }
+      }
+    };
     return {
       loading: false,
       status: "", //存储详情接口返的状态
       showModelThis: this.showModel,
       wsm_supplier_name: "",
       wsm_code_name: "",
+      return_tag: "",
       ruleForm: {
         wsm_supplier: "",
         wsm_supplierNo: [],
@@ -141,11 +181,35 @@ export default {
             message: "请选择退货仓库",
           },
         ],
-      },
-      pageInfo: {
-        size: 15,
-        curr: 1,
-        total: 0,
+        contactor: [
+          {
+            required: true,
+            trigger: "blur",
+            validator: validatename,
+          },
+        ],
+        mobile: [
+          {
+            required: true,
+            trigger: "blur",
+            validator: validatemobile,
+          },
+        ],
+        addr_code: [
+          {
+            type: "array",
+            required: true,
+            trigger: "change",
+            message: "请选择省市区",
+          },
+        ],
+        addr: [
+          {
+            required: true,
+            trigger: "blur",
+            message: "请输入详细地址",
+          },
+        ],
       },
     };
   },
@@ -199,9 +263,11 @@ export default {
             wsm_name,
             addr_code,
             addrs_code,
+            return_tag,
           } = this.sitem;
 
           this.status = status;
+          this.return_tag = return_tag || "";
           this.wsm_supplier_name = wsm_supplier;
           this.wsm_code_name = wsm_name;
           this.wsm_supplier_code = wsm_supplierNo;
@@ -223,6 +289,8 @@ export default {
                 ? [provice_code, city_code, area_code]
                 : [];
           }
+          this.rulesThis.wsm_supplierNo[0].required = this.return_tag === "2";
+          this.rulesThis.wsm_code[0].required = this.return_tag === "2";
         }
       });
     },
@@ -292,6 +360,10 @@ export default {
         ? [provice_code, city_code, area_code]
         : [];
     },
+    addr_selectChange(e) {
+      this.ruleForm.addr_code = e || [];
+      this.$refs.ruleForm.validateField("addr_code");
+    },
   },
 };
 </script>

src/views/sellOut/sellAfterApply/components/purchase_exam.vue

@@ -30,20 +30,18 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          label="承担物流费"
-          prop="is_post"
-          v-show="ruleForm.status === '1' && is_receive === '1'"
-        >
+      </el-col>
+      <el-col :span="6" v-show="ruleForm.status === '1' && is_receive === '1'">
+        <el-form-item label="物流费承担方" prop="is_th" label-width="110px">
           <el-select
-            v-model="ruleForm.is_post"
+            v-model="ruleForm.is_th"
             style="width: 100%"
             :disabled="!(status == '2' && powers.some((item) => item == '040'))"
             placeholder="是否承担物流费"
             :size="'mini'"
           >
             <el-option
-              v-for="item in is_post_list"
+              v-for="item in is_th_list"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -52,11 +50,29 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="18">
+      <el-col :span="6" v-show="ruleForm.status === '1' && is_receive === '1'">
+        <el-form-item label="退回至" prop="return_tag">
+          <el-select
+            v-model="ruleForm.return_tag"
+            style="width: 100%"
+            :disabled="!(status == '2' && powers.some((item) => item == '040'))"
+            placeholder="是否承担物流费"
+            :size="'mini'"
+          >
+            <el-option
+              v-for="item in return_tag_options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12" v-show="ruleForm.status === '0'">
         <el-form-item
           label="审核备注"
           :disabled="!(status == '2' && powers.some((item) => item == '040'))"
-          v-if="ruleForm.status === '0'"
           prop="remark"
         >
           <el-input
@@ -70,18 +86,19 @@
             show-word-limit
           />
         </el-form-item>
-        <el-form-item
-          class="fr"
-          v-if="status == '2' && powers.some((item) => item == '040')"
-        >
-          <el-button
-            v-if="!isDetail"
-            :size="'mini'"
-            type="primary"
-            @click="submitForm"
-            >保 存
-          </el-button>
-        </el-form-item>
+      </el-col>
+      <el-col
+        :span="6"
+        v-if="status == '2' && powers.some((item) => item == '040')"
+        class="tr"
+      >
+        <el-button
+          v-if="!isDetail"
+          :size="'mini'"
+          type="primary"
+          @click="submitForm"
+          >保 存
+        </el-button>
       </el-col>
     </el-row>
   </el-form>
@@ -108,20 +125,36 @@ export default {
           label: "驳回",
         },
       ],
-      is_post_list: [
+      is_th_list: [
         {
           value: "1",
-          label: "愿意承担",
+          label: "收货人承担",
         },
         {
-          value: "0",
-          label: "不愿承担",
+          value: "2",
+          label: "业务公司承担",
+        },
+        {
+          value: "3",
+          label: "供应商承担",
         },
       ],
+      return_tag_options: [
+        {
+          value: "1",
+          label: "供应商仓库",
+        },
+        {
+          value: "2",
+          label: "业务公司仓库",
+        },
+      ],
+
       showModelThis: this.showModel,
       ruleForm: {
         status: "1", // 通过or驳回
-        is_post: "", //驳回至
+        is_th: "1", //驳回至
+        return_tag: "1",
         remark: "",
       },
       rulesThis: this.rules,
@@ -133,10 +166,17 @@ export default {
             trigger: "change",
           },
         ],
-        is_post: [
+        is_th: [
+          {
+            required: true,
+            message: "请选择物流费承担方",
+            trigger: "change",
+          },
+        ],
+        return_tag: [
           {
             required: true,
-            message: "请选择是否承担物流费",
+            message: "请选择退回位置",
             trigger: "change",
           },
         ],
@@ -185,7 +225,7 @@ export default {
     },
 
     statusChange() {
-      this.rulesThis.is_post[0].required =
+      this.rulesThis.is_th[0].required =
         this.ruleForm.status === "1" && this.is_receive === "1";
       this.rulesThis.remark[0].required = this.ruleForm.status !== "1";
     },
@@ -195,13 +235,15 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          const { returnCode, is_receive, status } = this.sitem;
+          const { returnCode, is_receive, status, return_tag, is_th, remark } =
+            this.sitem;
           this.status = status || "";
           this.is_receive = is_receive || "1";
           this.ruleForm = {
             status: "1", // 通过or驳回
-            is_post: "1", //驳回至
-            remark: "",
+            is_th: is_th || "1", //驳回至
+            return_tag: return_tag || "1",
+            remark: remark || "",
             returnCode: returnCode || "",
           };
         }
@@ -212,7 +254,10 @@ export default {
         if (valid) {
           let model = JSON.parse(JSON.stringify(this.ruleForm));
           model.status = model.status === "1" ? "3" : "6";
-          model.is_post = this.is_receive === "0" ? "0" : model.is_post;
+          model.is_th = this.is_receive === "0" ? "0" : model.is_th;
+          model.return_tag = this.is_receive === "0" ? "0" : model.return_tag;
+          model.is_post = "0";
+          console.log(model);
           let res = await asyncRequest.status(model);
 
           if (res && res.code === 0) {

src/views/sellOut/sellAfterApply/detail.vue

@@ -115,7 +115,6 @@
               name="4"
               v-if="
                 sitem &&
-                sitem.order_type !== '1' &&
                 sitem.is_receive === '1' &&
                 (status == '3' || status == '4' || status == '5')
               "
@@ -127,13 +126,6 @@
                 @refresh="initData"
               ></express-feedback>
             </el-collapse-item>
-            <el-collapse-item
-              title="用户退货"
-              name="4"
-              v-if="sitem && sitem.order_type !== '1' && status == '4'"
-            >
-              用户退货
-            </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
         <el-tab-pane label="审批记录" name="2">

src/views/sellOut/zixunOrder/columns.js

@@ -500,7 +500,7 @@ const feedbackListCol = [
     fixed: "right",
     _noset_: true,
     _slot_: "operation",
-    width: 80,
+    width: 120,
   },
 ]
 

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

@@ -62,15 +62,15 @@
             status-icon
             :rules="rulesThis"
             :size="'mini'"
-            label-width="90px"
+            label-width="55px"
             class="demo-ruleForm"
           >
             <el-row>
-              <el-col :span="8">
-                <el-form-item label="购买数量" prop="good_num">
+              <el-col :span="5">
+                <el-form-item label="数量" prop="good_num">
                   <digital-input
                     :values="ruleForm.good_num"
-                    :placeholder="'购买数量'"
+                    :placeholder="'数量'"
                     :min="sitem.in_num"
                     :max="100000000000"
                     :position="'right'"
@@ -83,8 +83,8 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="商品单价" prop="sale_price">
+              <el-col :span="6">
+                <el-form-item label="单价" prop="sale_price">
                   <digital-input
                     :values="ruleForm.sale_price"
                     :placeholder="'商品单价'"
@@ -101,7 +101,20 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="发货方式" prop="sendtype">
+                <el-form-item label="总金额" prop="good_num" label-width="70px">
+                  <el-input
+                    v-model="total_price"
+                    placeholder="总金额"
+                    disabled
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="5">
+                <el-form-item
+                  label="发货方式"
+                  prop="sendtype"
+                  label-width="90px"
+                >
                   <el-select
                     v-model="ruleForm.sendtype"
                     placeholder="发货方式"
@@ -122,6 +135,11 @@
                   >保 存
                 </el-button>
               </el-col>
+              <el-col :span="24">
+                <el-form-item label="订单备注" prop="remark" label-width="85px">
+                  <el-input v-model="ruleForm.remark" placeholder="订单备注" />
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </el-col>
@@ -407,6 +425,7 @@ export default {
     };
     return {
       loading: false,
+      total_price: "0",
       addrmodel: false,
       showModelThis: this.showModel,
       showGoodsModel: false,
@@ -429,6 +448,7 @@ export default {
         sale_price: "",
         sendtype: "1", // 发货方式
         arrtime: "", // 到货时间
+        remark: "",
       },
       rulesThis: this.rules,
       rules: {
@@ -449,10 +469,17 @@ export default {
         sendtype: [
           {
             required: true,
-            message: "请选择商品",
+            message: "请选择发货方式",
             trigger: "change",
           },
         ],
+        remark: [
+          {
+            required: true,
+            message: "输入订单备注",
+            trigger: "blur",
+          },
+        ],
       },
       addrForm: {
         order_addr: [], //收货地址
@@ -524,6 +551,13 @@ export default {
     num_change(e, key) {
       this.ruleForm[key] = e + "";
       this.$refs.ruleForm.validateField(key);
+      this.set_total_price();
+    },
+    set_total_price() {
+      const { good_num, sale_price } = this.ruleForm;
+      let num = good_num * 1;
+      let price = sale_price * 1;
+      this.total_price = num * price + "";
     },
     async initForm() {
       this.loading = true;
@@ -540,6 +574,7 @@ export default {
       }
       await this.resetForm();
       this.getNewTime();
+      this.set_total_price();
       this.loading = false;
     },
     addrRefresh(e) {
@@ -556,13 +591,15 @@ export default {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
-          const { bidNo, in_num, in_arrival_time, sale_price } = this.sitem;
+          const { bidNo, in_num, in_arrival_time, sale_price, remark } =
+            this.sitem;
           this.ruleForm = {
             bidNo: bidNo || "", //咨询单反馈编号
             good_num: in_num || "0", //商品数量
             sale_price: sale_price || "",
             sendtype: "1", // 发货方式
             arrtime: in_arrival_time || "", // 到货时间
+            remark:  "",
           };
         }
 

src/views/sellOut/zixunOrder/components/feedbackList.vue

@@ -58,22 +58,15 @@
 
       <template #operation="{ scope }">
         <!-- 状态 -->
-        <!-- <el-tooltip
-            v-if="powers.some((item) => item == '007')"
-            effect="dark"
-            content="详情"
-            placement="top"
-          >
-            <i
-              class="el-icon-view tb-icon"
-              @click="
-                routeGoto('zixunOrderDetail', {
-                  id: scope.row.infoNo,
-                  type: 'view',
-                })
-              "
-            ></i>
-          </el-tooltip> -->
+        <el-tooltip
+          v-if="powers.some((item) => item == '007')"
+          effect="dark"
+          content="详情"
+          placement="top"
+        >
+          <i class="el-icon-view tb-icon" @click="show_view(scope.row)"></i>
+        </el-tooltip>
+        <!-- {{ status }}-- {{ scope.row.status }} -->
         <el-tooltip
           v-if="
             powers &&
@@ -83,7 +76,9 @@
             (status === '2' ||
               status === '7' ||
               (status === '3' &&
-                (scope.row.status === '2' || scope.row.status === '5')))
+                scope.row.status !== '3' &&
+                scope.row.status !== '4' &&
+                scope.row.status !== '6'))
           "
           effect="dark"
           content="发起议价流程"
@@ -136,7 +131,7 @@
       :showModel="wantBmodel"
       :sitem="wantBsitem"
       @cancel="wantBmodel = false"
-      @refresh="(wantBmodel = false), searchList()"
+      @refresh="(wantBmodel = false), $emit('resGoodOk')"
     />
     <buy-good-modal
       :showModel="bayGoodShowModel"
@@ -189,6 +184,8 @@ export default {
   },
   data() {
     return {
+      view_spuCode: "",
+      view_show: false,
       wantBmodel: false,
       wantBsitem: "",
       select: "1",

src/views/stock/stockCount/index.vue

@@ -7,15 +7,15 @@
         <el-row>
           <el-col>
             <el-tabs v-model="activeName">
-              <!--  <el-tab-pane label="商品维度" name="productWeido"
+               <el-tab-pane label="商品维度" name="productWeido"
                 ><product-weido
-              /></el-tab-pane>-->
+              /></el-tab-pane>
              <el-tab-pane label="仓库维度" name="dataWeido">
                 <data-weido
               /></el-tab-pane>
-             <!--   <el-tab-pane label="区间统计" name="count">
+               <el-tab-pane label="区间统计" name="count">
                 <space-count
-              /></el-tab-pane> -->
+              /></el-tab-pane>
             </el-tabs>
           </el-col>
         </el-row>
@@ -59,7 +59,7 @@ export default {
   },
   data() {
     return {
-      activeName: "dataWeido", //默认选中的区间统计选项
+      activeName: "productWeido", //默认选中的区间统计选项
     };
   },
   methods: {},

src/views/stock/survey/index.vue

@@ -85,7 +85,7 @@
         </template>
         <template #type_status="{ scope }">
           <el-tag
-            :size="tablebtnSize"
+            :size="'mini'"
             :type="scope.row.type == '0' ? 'warning' : ''"
             v-text="
               (statusOptions.find((item) => item.id == scope.row.type) || {})
@@ -99,8 +99,8 @@
             v-if="scope.row.item && scope.row.item.length > 0"
             :size="tablebtnSize"
           >
-            <span v-for="(si, sii) in scope.row.item" :key="si.id + sii"
-              >{{ sii === 0 ? "" : "/" }}{{ si.name }}</span
+            <span v-for="(si, sii) in scope.row.item" :key="si + sii"
+              >{{si}}</span
             >
           </el-tag>
         </template>
@@ -211,13 +211,14 @@ export default {
       },
       columns: [
         {
-          prop: "id",
+          prop: "good_log_code",
           label: "业务编号",
+           width: "160px",
         },
         {
           prop: "action_type_cn",
           label: "库存来源",
-          width: "120px",
+          width: "90px",
         },
 
         {