Merge branch 'v3.0-dev-before' of http://120.46.155.214:3000/xiaodai2022/order-ui-pc into v3.0-dev-before

src/components/good-online-platform-modal/main.vue

@@ -187,7 +187,7 @@ export default {
         companyNo: '',
         is_stock: '',
         exam_status: '',
-        cat_id: [], // 商品属性code
+        cat_id: [], // 商品成本code
         brandid: [],
         skucode: '',
         spucode: '', // 商品编码
@@ -243,7 +243,7 @@ export default {
         platform_code: platform_code || '',
         companyNo: company_id || '', // 业务企业编号
         is_stock: is_stock || '',
-        cat_id: [], // 商品属性code
+        cat_id: [], // 商品成本code
         brandid: [],
         exam_status: this.active ? '3' : '',
         skucode: '',

src/components/search-good-online-modal/main.vue

@@ -188,7 +188,7 @@ export default {
         companyNo: "",
         is_stock: "",
         exam_status: "",
-        cat_id: [], // 商品属性code
+        cat_id: [], // 商品成本code
         brandid: [],
         skucode: "",
         spucode: "", // 商品编码
@@ -244,7 +244,7 @@ export default {
         platform_code: platform_code || "",
         companyNo: company_id || "", //业务企业编号
         is_stock: is_stock || "",
-        cat_id: [], // 商品属性code
+        cat_id: [], // 商品成本code
         brandid: [],
         exam_status: this.active ? "3" : "",
         skucode: "",

src/components/search-youzan-good-online-modal/main.vue

@@ -188,7 +188,7 @@ export default {
         companyNo: "",
         is_stock: "",
         exam_status: "",
-        cat_id: [], // 商品属性code
+        cat_id: [], // 商品成本code
         brandid: [],
         skucode: "",
         spucode: "", // 商品编码
@@ -244,7 +244,7 @@ export default {
         platform_code: platform_code || "",
         companyNo: company_id || "", //业务企业编号
         is_stock: is_stock || "",
-        cat_id: [], // 商品属性code
+        cat_id: [], // 商品成本code
         brandid: [],
         exam_status: this.active ? "3" : "",
         skucode: "",

src/components/search-youzan-txx-good-online-modal/main.vue

@@ -188,7 +188,7 @@ export default {
         companyNo: "",
         is_stock: "",
         exam_status: "",
-        cat_id: [], // 商品属性code
+        cat_id: [], // 商品成本code
         brandid: [],
         skucode: "",
         spucode: "", // 商品编码
@@ -244,7 +244,7 @@ export default {
         platform_code: platform_code || "",
         companyNo: company_id || "", //业务企业编号
         is_stock: is_stock || "",
-        cat_id: [], // 商品属性code
+        cat_id: [], // 商品成本code
         brandid: [],
         exam_status: this.active ? "3" : "",
         skucode: "",

src/components/show-voucher-model/columns.js

@@ -12,7 +12,7 @@ export default [
   },
   {
     prop: "proof_url",
-    label: "凭证文件",
+    label: "比价凭证",
     _slot_: "proof_url",
   },
   {

src/components/show-voucher-model/main.vue

@@ -101,7 +101,7 @@
               alt=""
             />
           </div>
-          <a v-else :href="scope.row.proof_url" download="凭证文件">点击下载</a>
+          <a v-else :href="scope.row.proof_url" download="比价凭证">点击下载</a>
         </template>
       </ex-table>
     </el-card>

src/views/bbc/bbcOnline/ShowDataTableColumns.js

@@ -153,7 +153,7 @@ const public_listCol = [
   },
   {
     prop: 'proof_id',
-    label: '凭证文件',
+    label: '比价凭证',
     _slot_: 'proof_id',
     span: 6
   },

src/views/bbc/bbcOnline/components/fixed-price-form-c.vue

@@ -327,7 +327,7 @@
               >查看历史凭证</el-button
             >
           </el-form-item>
-          <el-form-item label="凭证文件" prop="proof_url">
+          <el-form-item label="比价凭证" prop="proof_url">
             <ul class="shangchuan-ul">
               <li v-if="ruleForm.proof_type === '1'" class="shiping">
                 <div v-if="video_url" class="clearfix">
@@ -409,7 +409,7 @@
               </li>
               <li v-if="ruleForm.proof_type === '3'" class="qita">
                 <div v-if="other_url" class="clearfix">
-                  <a :href="other_url" download="凭证文件">点击下载</a>
+                  <a :href="other_url" download="比价凭证">点击下载</a>
 
                   <el-link
                     :underline="false"
@@ -601,7 +601,7 @@ export default {
         skuCode: "",
         numStatus: "",
         state: "1", //通过or驳回
-        proof_type: "1", //
+        proof_type: "2", //
         proof_url: "", //驳回至
         remark: "",
       },
@@ -624,7 +624,7 @@ export default {
         // proof_url: [
         //   {
         //     required: true,
-        //     message: "请上传凭证文件",
+        //     message: "请上传比价凭证",
         //     trigger: "blur,change",
         //   },
         // ],
@@ -908,7 +908,7 @@ export default {
             state: "1", // 通过or驳回
             remark: "",
             numStatus: "",
-            proof_type: proof && proof.proof_type ? proof.proof_type : "1", // 通过or驳回
+            proof_type: proof && proof.proof_type ? proof.proof_type : "2", // 通过or驳回
             proof_url: proof && proof.proof_url ? proof.proof_url : "", //驳回至
           };
           this.addrForm = {

src/views/bbc/bbcOnline/components/fixed-price-form.vue

@@ -298,7 +298,7 @@
             </el-radio-group>
             <el-button class="fr" type="primary" @click="showVoucher = true">查看历史凭证</el-button>
           </el-form-item>
-          <el-form-item label="凭证文件" prop="proof_url">
+          <el-form-item label="比价凭证" prop="proof_url">
             <ul class="shangchuan-ul">
               <li v-if="ruleForm.proof_type === '1'" class="shiping">
                 <div v-if="video_url" class="clearfix">
@@ -373,7 +373,7 @@
               </li>
               <li v-if="ruleForm.proof_type === '3'" class="qita">
                 <div v-if="other_url" class="clearfix">
-                  <a :href="other_url" download="凭证文件">点击下载</a>
+                  <a :href="other_url" download="比价凭证">点击下载</a>
 
                   <el-link
                     :underline="false"
@@ -562,7 +562,7 @@ export default {
         skuCode: "",
         numStatus: "",
         state: "1", //通过or驳回
-        proof_type: "1", //
+        proof_type: "2", //
         proof_url: "", //驳回至
         remark: ""
       },
@@ -578,7 +578,7 @@ export default {
         proof_url: [
           {
             required: true,
-            message: "请上传凭证文件",
+            message: "请上传比价凭证",
             trigger: "blur,change"
           }
         ],
@@ -880,7 +880,7 @@ export default {
             state: "1", // 通过or驳回
             remark: "",
             numStatus: "",
-            proof_type: proof && proof.proof_type ? proof.proof_type : "1", // 通过or驳回
+            proof_type: proof && proof.proof_type ? proof.proof_type : "2", // 通过or驳回
             proof_url: proof && proof.proof_url ? proof.proof_url : "" //驳回至
           };
           

src/views/bbc/bbcOnline/components/online-form.vue

@@ -44,7 +44,7 @@
               }}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="凭证文件" prop="proof_url">
+          <el-form-item label="比价凭证" prop="proof_url">
             <ul class="shangchuan-ul">
               <li v-if="ruleForm.proof_type + '' === '1'" class="shiping">
                 <div v-if="video_url" class="clearfix">
@@ -140,7 +140,7 @@
               </li>
               <li v-if="ruleForm.proof_type + '' === '3'" class="qita">
                 <div v-if="other_url" class="clearfix">
-                  <a :href="other_url" download="凭证文件">点击下载</a>
+                  <a :href="other_url" download="比价凭证">点击下载</a>
 
                   <el-button
                     type="text"
@@ -636,7 +636,7 @@ export default {
         numStatus: "",
         plat_code: "",
         state: "1", //通过or驳回
-        proof_type: "1", //
+        proof_type: "2", //
         proof_url: "", //驳回至
         remark: "",
       },
@@ -652,7 +652,7 @@ export default {
         proof_url: [
           {
             required: true,
-            message: "请上传凭证文件",
+            message: "请上传比价凭证",
             trigger: "blur,change",
           },
         ],
@@ -910,7 +910,7 @@ export default {
             state: "1", // 通过or驳回
             remark: "",
             numStatus: "",
-            proof_type: proof && proof.proof_type ? proof.proof_type : "1", // 通过or驳回
+            proof_type: proof && proof.proof_type ? proof.proof_type : "2", // 通过or驳回
             proof_url: proof && proof.proof_url ? proof.proof_url : "", //驳回至
           };
           this.good_ladder =

src/views/bbc/bbcOnline/detail.vue

@@ -40,7 +40,7 @@
                   <a
                     v-else-if="sitem.proof.proof_type + '' === '3'"
                     :href="sitem.proof.proof_url"
-                    download="凭证文件"
+                    download="比价凭证"
                   >点击下载</a>
                   <span v-else>暂无凭证</span>
                 </template>

src/views/dataCorrection/customerCorrection/components/_columns.js

@@ -228,7 +228,7 @@ const ShowDataTableColumns=[
   },
   {
     prop: 'proof_id',
-    label: '凭证文件',
+    label: '比价凭证',
     _slot_: 'proof_id',
     span: 6
   },

src/views/dataCorrection/customerCorrection/components/correctionForm.vue

@@ -164,7 +164,7 @@
                     <a
                       v-else-if="sitem.proof_type + '' === '3'"
                       :href="sitem.proof_url"
-                      download="凭证文件"
+                      download="比价凭证"
                     >点击下载</a>
                     <span v-else>暂无凭证</span>
                   </template>

src/views/dataCorrection/managerCorrection/components/_columns.js

@@ -226,7 +226,7 @@ const ShowDataTableColumns = [
   },
   {
     prop: 'proof_id',
-    label: '凭证文件',
+    label: '比价凭证',
     _slot_: 'proof_id',
     span: 6
   },

src/views/dataDashboard/stockCount/components/productWeido/index.vue

@@ -214,7 +214,7 @@ export default {
       //入参参数
       parmValue: {
         companyNo: "",
-        type_code: "", //商品属性编码
+        type_code: "", //商品成本编码
         good_name: "", //商品名称
         page: 1, // 页码
         size: 15 // 每页显示条数

src/views/dataDashboard/stockCount/components/spaceCount/index.vue

@@ -39,7 +39,7 @@
                   v-model="parmValue.type_code"
                   :size="searchSize"
                   maxlength="40"
-                  placeholder="商品属性编码"
+                  placeholder="商品成本编码"
                 />
               </el-col>
 

src/views/deliveryWorkOrderSupplement/deliveryWorkOrderSupplement/columns.js

@@ -136,7 +136,7 @@ export default [
 // size	是	string	页码数
 // cgdNo	是	string	采购单编号
 // returnCode	是	string	退货单编号
-// good_type_code	是	string	商品属性
+// good_type_code	是	string	商品成本
 // good_name	是	string	商品名称
 // status	是	string	状态
 export const sendOutOrderColumns = [

src/views/goodStore/goodsCost/components/copy-baseForm.vue

@@ -439,7 +439,7 @@
               >查看历史凭证</el-button
             > -->
           </el-form-item>
-          <el-form-item label="凭证文件" prop="proof_url">
+          <el-form-item label="比价凭证" prop="proof_url">
             <ul class="shangchuan-ul">
               <li v-if="ruleForm.proof_type === '1'" class="shiping">
                 <div v-if="video_url" class="clearfix">
@@ -521,7 +521,7 @@
               </li>
               <li v-if="ruleForm.proof_type === '3'" class="qita">
                 <div v-if="other_url" class="clearfix">
-                  <a :href="other_url" download="凭证文件">点击下载</a>
+                  <a :href="other_url" download="比价凭证">点击下载</a>
 
                   <el-link
                     :underline="false"
@@ -1227,7 +1227,7 @@ const rules = {
   proof_url: [
     {
       required: true,
-      message: "请上传凭证文件",
+      message: "请上传比价凭证",
       trigger: "blur,change",
     },
   ]
@@ -2016,7 +2016,7 @@ export default {
 
       this.ruleForm = {
         proof_url:"",
-        proof_type:"1",
+        proof_type:"2",
         id: "",
         spuCode: "",
         cat_id: [],

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

@@ -19,7 +19,7 @@
             </el-tooltip>
             {{ sitem.companyName }}</el-col
           >
-          <el-col :span="12" class="t2"
+          <el-col :span="15" class="t2"
             >供应商名称：
             <el-tooltip
               class="item"
@@ -31,7 +31,7 @@
             </el-tooltip>
             {{ sitem.supplierName }}</el-col
           >
-          <el-col :span="12" class="t2">成本编号：{{ sitem.spuCode }}</el-col>
+          <el-col :span="9" class="t2">成本编号：{{ sitem.spuCode }}</el-col>
         </el-row>
         <el-row>
           <el-col :span="24" style="padding: 5px 0">
@@ -110,6 +110,8 @@ export default {
     this.img_list = [];
     if (typeof this.sitem.good_info_img === "string") {
       this.img_list = (this.sitem.good_info_img || "").split(",");
+    } else {
+      this.img_list = this.sitem.good_info_img;
     }
 
     this.img_list = this.img_list.map(

src/views/goodStore/goodsCost/detail.vue

@@ -97,9 +97,8 @@
                   <template slot="good_info_img">
                     <div style="max-height: 24px; overflow: hidden">
                       <el-image
-                        v-for="imgSrc in sitem.good_info_img
-                          ? sitem.good_info_img.split(',')
-                          : []"
+                        v-for="(imgSrc, index) in sitem.good_info_img"
+                        :key="imgSrc + index"
                         style="height: 24px; width: 24px; margin-right: 5px"
                         :src="imgSrc"
                         :preview-src-list="[imgSrc]"
@@ -327,7 +326,7 @@ import baseFormNormal from "./components/baseFormNormal";
 import goodPreview from "./components/goodPreview";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
-
+import { isArray } from "@/utils/validate";
 import {
   packingColumns,
   ladderColumns,
@@ -498,6 +497,9 @@ export default {
       this.loading = false;
       if (code === 0) {
         this.sitem = JSON.parse(JSON.stringify(data));
+        if (!isArray(this.sitem.good_info_img)) {
+          this.sitem.good_info_img = this.sitem.good_info_img.split(",");
+        }
         const { status } = this.sitem;
         this.status = status;
         this.getNewTime();

src/views/goodStore/goodsOnline/ShowDataTableColumns.js

@@ -153,7 +153,7 @@ const public_listCol = [
   },
   {
     prop: 'proof_id',
-    label: '凭证文件',
+    label: '比价凭证',
     _slot_: 'proof_id',
     span: 6
   },

src/views/goodStore/goodsOnline/components/fixed-price-form-c.vue

@@ -327,7 +327,7 @@
               >查看历史凭证</el-button
             >
           </el-form-item>
-          <el-form-item label="凭证文件" prop="proof_url">
+          <el-form-item label="比价凭证" prop="proof_url">
             <ul class="shangchuan-ul">
               <li v-if="ruleForm.proof_type === '1'" class="shiping">
                 <div v-if="video_url" class="clearfix">
@@ -409,7 +409,7 @@
               </li>
               <li v-if="ruleForm.proof_type === '3'" class="qita">
                 <div v-if="other_url" class="clearfix">
-                  <a :href="other_url" download="凭证文件">点击下载</a>
+                  <a :href="other_url" download="比价凭证">点击下载</a>
 
                   <el-link
                     :underline="false"
@@ -601,7 +601,7 @@ export default {
         skuCode: "",
         numStatus: "",
         state: "1", //通过or驳回
-        proof_type: "1", //
+        proof_type: "2", //
         proof_url: "", //驳回至
         remark: "",
       },
@@ -624,7 +624,7 @@ export default {
         // proof_url: [
         //   {
         //     required: true,
-        //     message: "请上传凭证文件",
+        //     message: "请上传比价凭证",
         //     trigger: "blur,change",
         //   },
         // ],
@@ -908,7 +908,7 @@ export default {
             state: "1", // 通过or驳回
             remark: "",
             numStatus: "",
-            proof_type: proof && proof.proof_type ? proof.proof_type : "1", // 通过or驳回
+            proof_type: proof && proof.proof_type ? proof.proof_type : "2", // 通过or驳回
             proof_url: proof && proof.proof_url ? proof.proof_url : "", //驳回至
           };
           this.addrForm = {

src/views/goodStore/goodsOnline/components/fixed-price-form.vue

@@ -320,7 +320,7 @@
             </el-radio-group>
             <el-button class="fr" type="primary" @click="showVoucher = true">查看历史凭证</el-button>
           </el-form-item>
-          <el-form-item label="凭证文件" prop="proof_url">
+          <el-form-item label="比价凭证" prop="proof_url">
             <ul class="shangchuan-ul">
               <li v-if="ruleForm.proof_type === '1'" class="shiping">
                 <div v-if="video_url" class="clearfix">
@@ -395,7 +395,7 @@
               </li>
               <li v-if="ruleForm.proof_type === '3'" class="qita">
                 <div v-if="other_url" class="clearfix">
-                  <a :href="other_url" download="凭证文件">点击下载</a>
+                  <a :href="other_url" download="比价凭证">点击下载</a>
 
                   <el-link
                     :underline="false"
@@ -584,7 +584,7 @@ export default {
         skuCode: "",
         numStatus: "",
         state: "1", //通过or驳回
-        proof_type: "1", //
+        proof_type: "2", //
         proof_url: "", //驳回至
         remark: ""
       },
@@ -600,7 +600,7 @@ export default {
         proof_url: [
           {
             required: true,
-            message: "请上传凭证文件",
+            message: "请上传比价凭证",
             trigger: "blur,change"
           }
         ],
@@ -902,7 +902,7 @@ export default {
             state: "1", // 通过or驳回
             remark: "",
             numStatus: "",
-            proof_type: proof && proof.proof_type ? proof.proof_type : "1", // 通过or驳回
+            proof_type: proof && proof.proof_type ? proof.proof_type : "2", // 通过or驳回
             proof_url: proof && proof.proof_url ? proof.proof_url : "" //驳回至
           };
           

src/views/goodStore/goodsOnline/components/goodPreview.vue

@@ -7,7 +7,7 @@
       <div class="parameter">
         <el-row>
           <el-col :span="24" class="good_name">{{ sitem.good_name }}</el-col>
-          <el-col :span="12" class="t2"
+          <el-col :span="15" class="t2"
             >平台名称：
             <el-tooltip
               class="item"
@@ -18,8 +18,8 @@
               <el-icon class="el-icon-warning-outline" /> </el-tooltip
             >{{ sitem.platform_name }}</el-col
           >
-          <el-col :span="12" class="t2">平台商品编号：{{ sitem.plat_code }}</el-col>
-          <el-col :span="12" class="t2"
+          <el-col :span="9" class="t2">平台商品编号：{{ sitem.plat_code }}</el-col>
+          <el-col :span="15" class="t2"
             >业务公司：
             <el-tooltip
               class="item"
@@ -31,8 +31,8 @@
             </el-tooltip>
             {{ sitem.companyName }}</el-col
           >
-          <el-col :span="12" class="t2">上线商品编号：{{ sitem.skuCode }}</el-col>
-          <el-col :span="12" class="t2"
+          <el-col :span="9" class="t2">上线商品编号：{{ sitem.skuCode }}</el-col>
+          <el-col :span="15" class="t2"
             >供应商名称：
             <el-tooltip
               class="item"
@@ -44,7 +44,7 @@
             </el-tooltip>
             {{ sitem.supplierName }}</el-col
           >
-          <el-col :span="12" class="t2">成本商品编号：{{ sitem.spuCode }}</el-col>
+          <el-col :span="9" class="t2">成本商品编号：{{ sitem.spuCode }}</el-col>
         </el-row>
         <el-row>
           <el-col :span="24" style="padding: 5px 0">

src/views/goodStore/goodsOnline/components/online-form.vue

@@ -44,7 +44,7 @@
               }}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="凭证文件" prop="proof_url">
+          <el-form-item label="比价凭证" prop="proof_url">
             <ul class="shangchuan-ul">
               <li v-if="ruleForm.proof_type + '' === '1'" class="shiping">
                 <div v-if="video_url" class="clearfix">
@@ -140,7 +140,7 @@
               </li>
               <li v-if="ruleForm.proof_type + '' === '3'" class="qita">
                 <div v-if="other_url" class="clearfix">
-                  <a :href="other_url" download="凭证文件">点击下载</a>
+                  <a :href="other_url" download="比价凭证">点击下载</a>
 
                   <el-button
                     type="text"
@@ -636,7 +636,7 @@ export default {
         numStatus: "",
         plat_code: "",
         state: "1", //通过or驳回
-        proof_type: "1", //
+        proof_type: "2", //
         proof_url: "", //驳回至
         remark: "",
       },
@@ -652,7 +652,7 @@ export default {
         proof_url: [
           {
             required: true,
-            message: "请上传凭证文件",
+            message: "请上传比价凭证",
             trigger: "blur,change",
           },
         ],
@@ -910,7 +910,7 @@ export default {
             state: "1", // 通过or驳回
             remark: "",
             numStatus: "",
-            proof_type: proof && proof.proof_type ? proof.proof_type : "1", // 通过or驳回
+            proof_type: proof && proof.proof_type ? proof.proof_type : "2", // 通过or驳回
             proof_url: proof && proof.proof_url ? proof.proof_url : "", //驳回至
           };
           this.good_ladder =

src/views/goodStore/goodsOnline/detail.vue

@@ -41,7 +41,7 @@
                   <a
                     v-else-if="sitem.proof.proof_type + '' === '3'"
                     :href="sitem.proof.proof_url"
-                    download="凭证文件"
+                    download="比价凭证"
                     >点击下载</a
                   >
                   <span v-else>暂无凭证</span>

src/views/purchaseIn/beforeReturnGoodWorkOrder/columns.js

@@ -121,6 +121,6 @@ export default [
 // size	是	string	页码数
 // cgdNo	是	string	采购单编号
 // returnCode	是	string	退货单编号
-// good_type_code	是	string	商品属性
+// good_type_code	是	string	商品成本
 // good_name	是	string	商品名称
 // status	是	string	状态

src/views/purchaseIn/deliveryWorkOrder/columns.js

@@ -146,7 +146,7 @@ export default [
 // size	是	string	页码数
 // cgdNo	是	string	采购单编号
 // returnCode	是	string	退货单编号
-// good_type_code	是	string	商品属性
+// good_type_code	是	string	商品成本
 // good_name	是	string	商品名称
 // status	是	string	状态
 export const sendOutOrderColumns = [

src/views/purchaseIn/purchaseReturn/index.vue

@@ -336,7 +336,7 @@ export default {
         order_type: "",
         cgdNo: "", //采购单编号
         returnCode: "", //退货单编号
-        good_type_code: "", //商品属性编号
+        good_type_code: "", //商品成本编号
         good_name: "", //商品名称
         status: "", //节点状态
         status: "", //节点状态
@@ -425,7 +425,7 @@ export default {
         selectValue:"",
         cgdNo: "", //采购单编号
         returnCode: "", //退货单编号
-        good_type_code: "", //商品属性编号
+        good_type_code: "", //商品成本编号
         good_name: "", //商品名称
         status: "", //节点状态
         page: 1, // 页码

src/views/purchaseIn/returnGoodWorkOrder/columns.js

@@ -119,6 +119,6 @@ export default [
 // size	是	string	页码数
 // cgdNo	是	string	采购单编号
 // returnCode	是	string	退货单编号
-// good_type_code	是	string	商品属性
+// good_type_code	是	string	商品成本
 // good_name	是	string	商品名称
 // status	是	string	状态

src/views/sellOut/beforeReturnGoodWorkOrder/columns.js

@@ -121,6 +121,6 @@ export default [
 // size	是	string	页码数
 // cgdNo	是	string	采购单编号
 // returnCode	是	string	退货单编号
-// good_type_code	是	string	商品属性
+// good_type_code	是	string	商品成本
 // good_name	是	string	商品名称
 // status	是	string	状态

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

@@ -185,7 +185,7 @@ const showColumns = [
   },
   {
     prop: 'proof_id',
-    label: '凭证文件',
+    label: '比价凭证',
     _slot_: 'proof_id',
     span: 6
   },

src/views/sellOut/deliveryWorkOrder/columns.js

@@ -146,7 +146,7 @@ export default [
 // size	是	string	页码数
 // cgdNo	是	string	采购单编号
 // returnCode	是	string	退货单编号
-// good_type_code	是	string	商品属性
+// good_type_code	是	string	商品成本
 // good_name	是	string	商品名称
 // status	是	string	状态
 export const sendOutOrderColumns = [

src/views/sellOut/filing/cpns/baseForm.vue

@@ -66,7 +66,7 @@
 
           <el-form-item label="附件" prop="fill_url">
             <div v-if="ruleForm.fill_url" class="clearfix">
-              <a :href="ruleForm.fill_url" download="凭证文件">点击下载</a>
+              <a :href="ruleForm.fill_url" download="比价凭证">点击下载</a>
 
               <el-link
                 :underline="false"

src/views/sellOut/returnGoodWorkOrder/columns.js

@@ -141,6 +141,6 @@ export default [
 // size	是	string	页码数
 // cgdNo	是	string	采购单编号
 // returnCode	是	string	退货单编号
-// good_type_code	是	string	商品属性
+// good_type_code	是	string	商品成本
 // good_name	是	string	商品名称
 // status	是	string	状态

src/views/sellOut/returnOrder/columns.js

@@ -23,7 +23,7 @@ export default [
   },
   {
     prop: 'good_code',
-    label: '商品属性编号',
+    label: '商品成本编号',
     width: '150'
   },
   {

src/views/sellOut/returnTransferStock/columns.js

@@ -101,6 +101,6 @@ export default [
 // size	是	string	页码数
 // cgdNo	是	string	采购单编号
 // returnCode	是	string	退货单编号
-// good_type_code	是	string	商品属性
+// good_type_code	是	string	商品成本
 // good_name	是	string	商品名称
 // status	是	string	状态

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

@@ -191,7 +191,7 @@ const showColumns = [
   },
   {
     prop: 'proof_id',
-    label: '凭证文件',
+    label: '比价凭证',
     _slot_: 'proof_id',
     span: 6
   },

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

@@ -180,7 +180,7 @@
                 </el-col>
 
                 <el-col :span="12">
-                  <el-form-item label="凭证文件" prop="proof_id">
+                  <el-form-item label="比价凭证" prop="proof_id">
                     <el-tooltip effect="dark" content="查找历史凭证" placement="top" class="fr">
                       <i class="el-icon-search tb-icon" @click="showVoucherFun"></i>
                     </el-tooltip>
@@ -224,7 +224,7 @@
                           />
                         </div>
                         <div v-else class="clearfix">
-                          <a :href="ruleForm.proof_url" download="凭证文件">点击下载</a>
+                          <a :href="ruleForm.proof_url" download="比价凭证">点击下载</a>
                         </div>
                       </li>
                       <li v-else class="shiping">暂无凭证</li>
@@ -748,7 +748,7 @@ export default {
         arrtime: "", //要求到货时间
         new_good_price: "0",
         proof_id: "", //凭证ID
-        proof_type: "", //凭证类型
+        proof_type: "2", //凭证类型
         proof_url: "", //凭证地址
         activity_stock: "0",
         is_activity: "0", //是否参与活动,
@@ -811,7 +811,7 @@ export default {
         proof_id: [
           {
             required: false,
-            message: "请选择凭证文件",
+            message: "请选择比价凭证",
             trigger: "change"
           }
         ],
@@ -939,7 +939,7 @@ export default {
             arrtime: "", //要求到货时间
             new_good_price: "",
             proof_id: "", //凭证ID
-            proof_type: "", //凭证类型
+            proof_type: "2", //凭证类型
             proof_url: "", //凭证地址
             activity_stock: "0",
             goodtype: ["is_activity_0", "1"], //活动类型

src/views/sellOut/salesOrder/detail.vue

@@ -132,7 +132,7 @@
                   <a
                     v-else-if="sitem.proof_type + '' === '3' && sitem.proof_url"
                     :href="sitem.proof_url"
-                    download="凭证文件"
+                    download="比价凭证"
                   >点击下载</a>
                   <span v-else>暂无凭证</span>
                 </template>

src/views/sellOut/sellReturn/columns.js

@@ -139,6 +139,6 @@ export default [
 // size	是	string	页码数
 // cgdNo	是	string	采购单编号
 // returnCode	是	string	退货单编号
-// good_type_code	是	string	商品属性
+// good_type_code	是	string	商品成本
 // good_name	是	string	商品名称
 // status	是	string	状态

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

@@ -191,7 +191,7 @@ const showColumns = [
   },
   {
     prop: 'proof_id',
-    label: '凭证文件',
+    label: '比价凭证',
     _slot_: 'proof_id',
     span: 6
   },

src/views/sellOut/stockApply/index.vue

@@ -116,7 +116,7 @@
                     style="width: 130px"
                   >
                     <el-option label="备库申请编号" value="1" />
-                    <el-option label="商品属性编号" value="2" />
+                    <el-option label="商品成本编号" value="2" />
                     <el-option label="商品名称" value="3" />
                     <el-option label="申请人" value="4" />
                     <el-option label="申请人部门" value="5" />

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

@@ -178,7 +178,7 @@
                   </el-col>
 
                   <el-col :span="24">
-                    <el-form-item label="凭证文件" prop="proof_url" label-width="85px">
+                    <el-form-item label="比价凭证" prop="proof_url" label-width="85px">
                       <ul class="shangchuan-ul">
                         <li v-if="ruleForm.proof_type + '' === '1'" class="shiping">
                           <div v-if="video_url" class="clearfix">
@@ -253,7 +253,7 @@
                         </li>
                         <li v-if="ruleForm.proof_type + '' === '3'" class="qita">
                           <div v-if="other_url" class="clearfix">
-                            <a :href="other_url" download="凭证文件">点击下载</a>
+                            <a :href="other_url" download="比价凭证">点击下载</a>
 
                             <el-link
                               :underline="false"
@@ -736,7 +736,7 @@ export default {
         proof_url: [
           {
             required: true,
-            message: "请上传凭证文件",
+            message: "请上传比价凭证",
             trigger: "blur,change"
           }
         ]
@@ -900,7 +900,7 @@ export default {
             sendtype: "1", // 发货方式
             arrtime: in_arrival_time || "", // 到货时间
             remark: "",
-            proof_type: "1", // 通过or驳回
+            proof_type: "2", // 通过or驳回
             proof_url: "", // 驳回至
             companyNo: in_companyNo || "",
             goodtype: Number(sale_price) === 0 ? "2" : "1",

src/views/standingBook/components/detail10/columns.js

@@ -79,7 +79,7 @@ const columns = [
 
   {
     prop: 'proof_id',
-    label: '凭证文件',
+    label: '比价凭证',
     _slot_: 'proof_id',
     span: 8
   },

src/views/standingBook/components/detail10/main.vue

@@ -88,7 +88,7 @@
         <a
           v-else-if="sitem.proof_type + '' === '3'"
           :href="sitem.proof_url"
-          download="凭证文件"
+          download="比价凭证"
           >点击下载</a
         >
         <span v-else>暂无凭证</span>

src/views/standingBook/components/detail13/columns.js

@@ -92,7 +92,7 @@ const listColumens = [
   },
   {
     prop: 'good_code',
-    label: '商品属性编号',
+    label: '商品成本编号',
     minWidth: '150'
   },
   {

src/views/standingBook/components/detail14/columns.js

@@ -17,7 +17,7 @@ const listColumens = [
   },
   {
     prop: 'good_code',
-    label: '商品属性编码',
+    label: '商品成本编码',
     width: '160'
   },
   {

src/views/standingBook/components/detail4/main.vue

@@ -123,7 +123,7 @@ export default {
       parmValue: {
         cgdNo: "", //采购单编号
         returnCode: "", //退货单编号
-        good_type_code: "", //商品属性编号
+        good_type_code: "", //商品成本编号
         good_name: "", //商品名称
         status: "", //节点状态
         status: "", //节点状态

src/views/stock/check/components/resultUplod.vue

@@ -145,7 +145,7 @@ export default {
       columns: [
         {
           prop: "good_type_code",
-          label: "商品属性编号",
+          label: "商品成本编号",
           "min-width": "130px",
         },
 

src/views/stock/check/components/resultUplodModel.vue

@@ -66,7 +66,7 @@ export default {
       head: [
         "商品批次号",
         "商品编码",
-        // "商品属性编码",
+        // "商品成本编码",
         "商品名称",
         "商品描述",
         "品牌",

src/views/stock/stockCount/components/productWeido/index.vue

@@ -183,7 +183,7 @@ export default {
       modelId: 0,
       //入参参数
       parmValue: {
-        type_code: "", //商品属性编码
+        type_code: "", //商品成本编码
         good_name: "", //商品名称
         size: 15, // 每页显示条数
         page: 1 // 页码

src/views/stock/stockCount/components/spaceCount/index.vue

@@ -39,7 +39,7 @@
                   v-model="parmValue.type_code"
                   :size="searchSize"
                   maxlength="40"
-                  placeholder="商品属性编码"
+                  placeholder="商品成本编码"
                 />
               </el-col>
 

src/views/supplierPurchaseIn/supplierBeforeReturnGoodWorkOrder/columns.js

@@ -127,6 +127,6 @@ export default [
 // size	是	string	页码数
 // cgdNo	是	string	采购单编号
 // returnCode	是	string	退货单编号
-// good_type_code	是	string	商品属性
+// good_type_code	是	string	商品成本
 // good_name	是	string	商品名称
 // status	是	string	状态

src/views/supplierPurchaseIn/supplierDeliveryWorkOrder/columns.js

@@ -146,7 +146,7 @@ export default [
 // size	是	string	页码数
 // cgdNo	是	string	采购单编号
 // returnCode	是	string	退货单编号
-// good_type_code	是	string	商品属性
+// good_type_code	是	string	商品成本
 // good_name	是	string	商品名称
 // status	是	string	状态
 export const sendOutOrderColumns = [

src/views/supplierPurchaseIn/supplierPurchaseReturn/index.vue

@@ -137,7 +137,7 @@
                   >
                     <el-option label="退货单编号" value="returnCode"></el-option>
                     <el-option label="采购单编号" value="cgdNo"></el-option>
-                    <el-option label="商品属性编码" value="good_type_code"></el-option>
+                    <el-option label="商品成本编码" value="good_type_code"></el-option>
                     <el-option label="商品名称" value="good_name"></el-option>
                   </el-select>
                   <el-button
@@ -292,7 +292,7 @@ export default {
         companyNo: "",
         cgdNo: "", //采购单编号
         returnCode: "", //退货单编号
-        good_type_code: "", //商品属性编号
+        good_type_code: "", //商品成本编号
         good_name: "", //商品名称
         status: "", //节点状态
         status: "", //节点状态
@@ -375,7 +375,7 @@ export default {
       this.parmValue = {
         cgdNo: "", //采购单编号
         returnCode: "", //退货单编号
-        good_type_code: "", //商品属性编号
+        good_type_code: "", //商品成本编号
         good_name: "", //商品名称
         status: "", //节点状态
         page: 1, // 页码

src/views/supplierPurchaseIn/supplierReturnWorkOrder/columns.js

@@ -123,6 +123,6 @@ export default [
 // size	是	string	页码数
 // cgdNo	是	string	采购单编号
 // returnCode	是	string	退货单编号
-// good_type_code	是	string	商品属性
+// good_type_code	是	string	商品成本
 // good_name	是	string	商品名称
 // status	是	string	状态

src/views/supplierPurchaseIn/supplierWsmInOrder/index.vue

@@ -318,7 +318,7 @@ export default {
         cgdNo: "", // 采购单编码
         apply_name: "", // 申请人
         good_name: "", // 商品名称
-        good_type_code: "", // 商品属性编号
+        good_type_code: "", // 商品成本编号
 
         status: "", //状态
 
@@ -427,7 +427,7 @@ export default {
         cgdNo: "", // 采购单编码
         apply_name: "", // 申请人
         good_name: "", // 商品名称
-        good_type_code: "", // 商品属性编号
+        good_type_code: "", // 商品成本编号
         status: "", //状态
         wsm_code: "", //入货仓库编码
         start: "", //新建起始时间
@@ -504,7 +504,7 @@ export default {
       this.parmValue.cgdNo = this.select === "1" ? this.input : ""; // 采购单编码
       this.parmValue.wsm_in_code = this.select === "2" ? this.input : ""; // 入库单号
       // this.parmValue.bk_code = this.select === "3" ? this.input : ""; // 备库编码
-      this.parmValue.good_type_code = this.select === "4" ? this.input : ""; // 商品属性编号
+      this.parmValue.good_type_code = this.select === "4" ? this.input : ""; // 商品成本编号
       this.parmValue.good_name = this.select === "5" ? this.input : ""; // 商品名称
       this.parmValue.apply_name = this.select === "6" ? this.input : ""; // 申请人
       this.parmValue.supplierNo = this.select === "7" ? this.input : ""; // 采购供应商编号

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/columns.js

@@ -127,6 +127,6 @@ export default [
 // size	是	string	页码数
 // cgdNo	是	string	采购单编号
 // returnCode	是	string	退货单编号
-// good_type_code	是	string	商品属性
+// good_type_code	是	string	商品成本
 // good_name	是	string	商品名称
 // status	是	string	状态

src/views/supplierSellOut/supplierDeliveryWorkOrder/columns.js

@@ -146,7 +146,7 @@ export default [
 // size	是	string	页码数
 // cgdNo	是	string	采购单编号
 // returnCode	是	string	退货单编号
-// good_type_code	是	string	商品属性
+// good_type_code	是	string	商品成本
 // good_name	是	string	商品名称
 // status	是	string	状态
 export const sendOutOrderColumns = [

src/views/supplierSellOut/supplierFiling/cpns/baseForm.vue

@@ -66,7 +66,7 @@
 
           <el-form-item label="附件" prop="fill_url">
             <div v-if="ruleForm.fill_url" class="clearfix">
-              <a :href="ruleForm.fill_url" download="凭证文件">点击下载</a>
+              <a :href="ruleForm.fill_url" download="比价凭证">点击下载</a>
 
               <el-link
                 :underline="false"

src/views/supplierSellOut/supplierReturnOrder/columns.js

@@ -23,7 +23,7 @@ export default [
   },
   {
     prop: 'good_code',
-    label: '商品属性编号',
+    label: '商品成本编号',
     width: '150'
   },
   {

src/views/supplierSellOut/supplierReturnWorkOrder/columns.js

@@ -123,6 +123,6 @@ export default [
 // size	是	string	页码数
 // cgdNo	是	string	采购单编号
 // returnCode	是	string	退货单编号
-// good_type_code	是	string	商品属性
+// good_type_code	是	string	商品成本
 // good_name	是	string	商品名称
 // status	是	string	状态

src/views/supplierSellOut/supplierSellReturn/columns.js

@@ -132,6 +132,6 @@ export default [
 // size	是	string	页码数
 // cgdNo	是	string	采购单编号
 // returnCode	是	string	退货单编号
-// good_type_code	是	string	商品属性
+// good_type_code	是	string	商品成本
 // good_name	是	string	商品名称
 // status	是	string	状态

src/views/youzan/othOrder/columns.js

@@ -272,7 +272,7 @@ const showColumns = [
 
   {
     prop: 'proof_id',
-    label: '凭证文件',
+    label: '比价凭证',
     _slot_: 'proof_id',
     span: 8
   },

src/views/youzan/othOrder/detail.vue

@@ -122,7 +122,7 @@
                   <a
                     v-else-if="String(sitem.proof_type) === '3'"
                     :href="sitem.proof_url"
-                    download="凭证文件"
+                    download="比价凭证"
                     >点击下载</a
                   >
                   <span v-else>暂无凭证</span>

src/views/youzan/othOrder/index.vue

@@ -143,7 +143,7 @@
                   >
                     <el-option label="订单编号" value="orderCode"></el-option>
                     <!-- <el-option
-                      label="商品属性编号"
+                      label="商品成本编号"
                       value="good_code"
                     ></el-option> -->
                     <!-- <el-option