Selaa lähdekoodia

Merge branch 'develop_yh36_2' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh37

bug
lilei 1 vuosi sitten
vanhempi
commit
303cacf7f8

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1710119651397
+  "version": 1710121318900
 }

+ 3 - 3
src/views/customerManagement/customerInfo/list.vue

@@ -48,8 +48,8 @@
                 </a-form-item>
               </a-col>
               <a-col :md="4" :sm="24">
-                <a-form-item label="启用禁用">
-                  <v-select code="ENABLE_FLAG" v-model="queryParam.enabledFlag" allowClear placeholder="请选择客户关系状态"></v-select>
+                <a-form-item label="启用状态">
+                  <v-select code="ENABLE_FLAG" v-model="queryParam.enabledFlag" allowClear placeholder="请选择启用状态"></v-select>
                 </a-form-item>
               </a-col>
             </template>
@@ -161,7 +161,7 @@ export default {
         { title: '客户关系', dataIndex: 'relationTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         // { title: '是否为下级', dataIndex: 'dealerFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '价格类型', dataIndex: 'priceTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '启用禁用', scopedSlots: { customRender: 'enableAction' }, width: '8%', align: 'center' },
+        { title: '启用状态', scopedSlots: { customRender: 'enableAction' }, width: '8%', align: 'center' },
         { title: <div><a-tooltip placement='top' title='注意:客户合并功能中,将以当前客户为对象,合并被选客户。'><a-icon type="question-circle" /></a-tooltip>&nbsp;操作</div>, scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 2 - 2
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -386,7 +386,7 @@ export default {
         { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '6%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
-      // 产品来源
+      // 产品来源 
       if (this.isDealerUp) {
         arr.splice(1, 0, { title: '产品编码', scopedSlots: { customRender: 'code' }, width: '15%', align: 'center', sorter: true })
         arr.splice(6, 0, { title: '产品来源', dataIndex: 'sysFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
@@ -510,7 +510,7 @@ export default {
           params.price = row.purchasePrice
           params.qty = row.qty
         }else{
-          this.$message.warning('成本价、终端会员价、车主零售价不能为空')
+          this.$message.warning('成本价、终端会员价、终端会员价不能为空!')
           return
         }
       } else { //  编辑

+ 1 - 1
src/views/purchasingManagement/purchaseOrderNew/chooseProductModal.vue

@@ -104,7 +104,7 @@
               class="button-primary"
               :loading="addLoading"
               @click="handleAdd(record)"
-              id="purchaseOrderEdit-add-btn">添加</a-button>
+              >添加</a-button>
           </template>
         </s-table>
         <div v-else>

+ 1 - 1
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -421,7 +421,7 @@ export default {
           params.price = row.purchasePrice
           params.qty = row.qty
         }else{
-          this.$message.warning('成本价、终端会员价、车主零售价不能为空')
+          this.$message.warning('成本价、终端会员价、终端会员价不能为空!')
           this.$refs.chooseProduct.spinning = false
           return
         }