feat

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

@@ -678,7 +678,7 @@
                 size="mini"
                 :disabled="type === 'view' || type === 'editCoin'"
                 :names="areaInfo.delivery_place.label"
-                placeholder="收货省市区"
+                placeholder="发货地"
                 :level="3"
                 @searchChange="areaChange($event, 'delivery_place')"
               />
@@ -692,7 +692,7 @@
                 :is-detail="true"
                 size="mini"
                 :names="areaInfo.origin_place.label"
-                placeholder="收货省市区"
+                placeholder="产地"
                 :level="3"
                 @searchChange="areaChange($event, 'origin_place')"
               />

src/views/goodStore/goodsCost/detail.vue

@@ -37,7 +37,7 @@
               <el-collapse-item title="基础信息" name="1">
                 <show-data-table :columns="basicColumns" :sitem="sitem">
                   <template slot="good_img">
-                    <template v-if="sitem.good_img">
+                    <template v-if="sitem && sitem.good_img">
                       <div style="max-height: 24px; overflow: hidden">
                         <el-image
                           style="height: 24px; width: 24px; margin-right: 5px"

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

@@ -680,7 +680,7 @@
                 size="mini"
                 :disabled="type === 'view' || type === 'editCoin'"
                 :names="areaInfo.delivery_place.label"
-                placeholder="收货省市区"
+                placeholder="发货地"
                 :level="3"
                 @searchChange="areaChange($event, 'delivery_place')"
               />
@@ -694,7 +694,7 @@
                 :is-detail="true"
                 size="mini"
                 :names="areaInfo.origin_place.label"
-                placeholder="收货省市区"
+                placeholder="产地"
                 :level="3"
                 @searchChange="areaChange($event, 'origin_place')"
               />

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

@@ -1141,7 +1141,7 @@ export default {
       this.pid = pid || "";
       this.ruleForm.cat_id = id ? [id] : [];
 
-      this.$refs.ruleForm.validateField("cat_id");
+      this.$refs.ruleForm && this.$refs.ruleForm.validateField("cat_id");
       const { is_gold_price } = this.ruleForm;
       this.is_noble = this.pid === "6" && is_gold_price === "1";
       this.setrules();

src/views/sellOut/salesOrder/components/out-order-add-model.vue

@@ -65,7 +65,7 @@
               </el-col>
               <el-col :span="24">
                 <el-form-item
-                  :label="'收货省市区'"
+                  :label="''"
                   prop="addr_code"
                   :label-width="'99px'"
                 >
@@ -74,7 +74,7 @@
                     :is-detail="true"
                     size="mini"
                     :names="label"
-                    placeholder="收货省市区"
+                    placeholder=""
                     :level="3"
                     @searchChange="areaChange($event)"
                   />
@@ -214,7 +214,7 @@ export default {
           {
             type: 'array',
             required: true,
-            message: '收货省市区不能为空',
+            message: '不能为空',
             trigger: 'change'
           }
         ],

src/views/sellOut/sellAfterApply/components/supplier-confirm.vue

@@ -22,7 +22,7 @@
           :is-detail="true"
           size="mini"
           :names="label"
-          placeholder="收货省市区"
+          placeholder="退货地址"
           :level="3"
           @searchChange="areaChange($event)"
         />

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

@@ -6,8 +6,8 @@
           <show-data-table
             v-if="newTime !== ''"
             style="padding: -5px 0 10px 0"
-            :new-time="newTime"
             :sitem="sitem"
+            :new-time="newTime"
             :columns="editColumns"
           >
             <template slot="status">

src/views/supplierSellOut/supplierSellAfterApply/components/supplier-confirm.vue

@@ -22,7 +22,7 @@
           :is-detail="true"
           size="mini"
           :names="label"
-          placeholder="收货省市区"
+          placeholder="退货地址"
           :level="3"
           @searchChange="areaChange($event)"
         />

src/views/supplierSellOut/supplierSellAfterApply/components/supplier_exam.vue

@@ -22,7 +22,7 @@
           :is-detail="true"
           size="mini"
           :names="label"
-          placeholder="收货省市区"
+          placeholder="退货地址"
           :level="3"
           @searchChange="areaChange($event)"
         />