暂存

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

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

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/detail.vue

@@ -124,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 !== ''"
@@ -133,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/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>
 

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

@@ -63,9 +63,8 @@
             :values="ruleForm.post_fee"
             :placeholder="'物流费用'"
             :min="0"
-            :name="'ruleForm.post_fee'"
             :disabled="id !== 'add'"
-            :max="ruleForm.post_fee"
+            :max="100000000000"
             :position="'right'"
             :precision="2"
             :size="'small'"
@@ -124,7 +123,7 @@
 <script>
 import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import resToken from "@/mixins/resToken";
-import {  isAlphanumeric } from "@/utils/validate";
+import { isAlphanumeric } from "@/utils/validate";
 export default {
   name: "wsmInOrderAdd",
   props: ["id", "sitem", "newTime", "modelSitem"],
@@ -262,7 +261,6 @@ export default {
       await this.resetForm();
       this.loading = false;
     },
-
     //初始化表单
     async resetForm() {
       await this.$nextTick(() => {
@@ -301,6 +299,7 @@ export default {
       });
     },
     number_change(e, key) {
+      console.log(e, key);
       this.ruleForm[key] = e + "" || "0";
       this.$refs.ruleForm.validateField(key);
     },

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,11 +106,19 @@
                 />
               </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.data_source=== '1' ? 'success' : ''"
+                :type="scope.row.data_source === '1' ? 'success' : ''"
                 >{{
                   scope.row.data_source === "1" ? "平台商品" : "采反商品"
                 }}</el-tag

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

@@ -543,21 +543,16 @@ 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;
       }
 
-      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="信息有效期"

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>