chenrui %!s(int64=4) %!d(string=hai) anos
pai
achega
4276b2ddd8

+ 3 - 3
src/views/salesManagement/salesReturn/chooseCustomModal.vue

@@ -27,17 +27,17 @@
       <a-row :gutter="15">
         <a-col :span="8">
           <a-form-model-item label="联系人">
-            {{ form.contact || '--' }}
+            {{ form.contactName || '--' }}
           </a-form-model-item>
         </a-col>
         <a-col :span="6">
           <a-form-model-item label="联系手机">
-            {{ form.contactMobile || '--' }}
+            {{ form.contactTel || '--' }}
           </a-form-model-item>
         </a-col>
         <a-col :span="10">
           <a-form-model-item label="客户地址">
-            {{ form.provinceName }} - {{ form.cityName }} - {{ form.districtName }} {{ form.address }}
+            <p style="line-height: 1.5em;margin: 0;">{{ form.provinceName }}{{ form.cityName }}{{ form.countyName }}{{ form.customerAddr }}</p>
           </a-form-model-item>
         </a-col>
       </a-row>

+ 1 - 1
src/views/salesManagement/salesReturn/detail.vue

@@ -216,7 +216,7 @@ export default {
       }).then(res => {
         if (res.status == 200) {
           this.$message.success(res.message)
-          this.$refs.table.refresh()
+          this.handleBack()
         }
       })
     },

+ 1 - 1
src/views/salesManagement/salesReturn/list.vue

@@ -143,7 +143,7 @@
         <span
           v-if="!(record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE'||record.billStatus == 'FINANCIAL_REJECT') &&
             !(record.billStatus == 'WAIT_CHECK') &&
-            !(record.salesReturnBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'FINANCIAL_REJECT'))">--</span>
+            !(record.salesReturnBillSource == 'SALES' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'FINANCIAL_REJECT'||record.billStatus == 'AUDIT_REJECT'))">--</span>
       </template>
     </s-table>
     <!-- 选择客户弹框 -->