Explorar el Código

bug修复【ID1007530】、【ID1007568】

chenrui hace 4 años
padre
commit
1f7f4cc70f

+ 1 - 0
src/views/common/chooseBrandModal.vue

@@ -130,6 +130,7 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
+        this.checkAll = false
       } else {
         const _this = this
         this.checkedRowList = this.chooseData

+ 2 - 0
src/views/common/chooseTypeModal.vue

@@ -64,6 +64,7 @@ export default {
       checkedKeys: [], //  选中项
       checkedRows: [], //  选中项  整条数据
       checkAll: false, //  全选
+      indeterminate: true,
       replaceFields: {
         children: 'children',
         title: 'productTypeName',
@@ -135,6 +136,7 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
+        this.checkAll = false
       } else {
         const _this = this
         this.checkedRows = this.chooseData

+ 3 - 2
src/views/productManagement/productPricing/editModal.vue

@@ -20,7 +20,7 @@
       >
         <a-form-model-item label="成本价">
           <div v-if="detailData && detailData.supplierProductList">
-            <p v-for="(item, index) in detailData.supplierProductList" :key="index" style="margin: 0;">{{ item.cost.toFixed(2) + ' 元 -- ' + item.supplierName + ';' }}</p>
+            <p v-for="(item, index) in detailData.supplierProductList" :key="index" style="margin: 0;">{{ ((item.cost || item.cost==0) ? item.cost.toFixed(2) : '--') + ' 元 -- ' + item.supplierName + ';' }}</p>
           </div>
           <span v-else>--</span>
         </a-form-model-item>
@@ -124,7 +124,7 @@ export default {
         afterSpecialPrice: '',
         afterTerminalPrice: '',
         afterCarOwnersPrice: '',
-        changeReason: ''
+        changeReason: undefined
       },
       rules: {
         changeReason: [
@@ -145,6 +145,7 @@ export default {
           this.form.afterSpecialPrice = res.data.afterSpecialPrice || ''
           this.form.afterTerminalPrice = res.data.afterTerminalPrice || ''
           this.form.afterCarOwnersPrice = res.data.afterCarOwnersPrice || ''
+          this.form.changeReason = res.data.changeReason || undefined
         } else {
           this.detailData = null
           this.$refs.ruleForm.resetFields()