fix: bug

src/views/basic_data/dealer/components/subMerchantForm.vue

@@ -110,21 +110,18 @@
         <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="审核人">
-              <el-input v-model="formData.approvalName" placeholder="系统自动生成" disabled /> </el-form-item
-          ></el-col>
+              <el-input v-model="formData.approvalName" placeholder="系统自动生成" disabled /> </el-form-item></el-col>
           <el-col :span="8">
             <el-form-item label="审核时间">
-              <el-input v-model="formData.approvalTime" placeholder="系统自动生成" disabled /> </el-form-item
-          ></el-col>
+              <el-input v-model="formData.approvalTime" placeholder="系统自动生成" disabled /> </el-form-item></el-col>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input v-model="formData.approvalRemark" placeholder="请输入备注" /> </el-form-item
-          ></el-col>
+              <el-input v-model="formData.approvalRemark" placeholder="请输入备注" /> </el-form-item></el-col>
         </el-row>
 
         <div style="margin: 20px">
-          <el-button type="primary" size="mini" @click="handleExamine">提交</el-button>
-          <el-button type="primary" size="mini" @click="handleReset">重置</el-button>
+          <el-button type="primary" size="mini" @click="handleExamine">同意</el-button>
+          <el-button type="primary" size="mini" @click="handleExamine('SAVE')">撤回</el-button>
         </div>
       </el-card>
     </el-form>
@@ -209,10 +206,10 @@ export default {
       }
       this.$emit('close')
     },
-    handleExamine() {
+    handleExamine(status = 'OK') {
       examineStagecustomer({
         id: this.formData.id,
-        examineStatus: 'OK',
+        examineStatus: status,
         approvalRemark: this.formData.approvalRemark
       }).then(res => {
         console.log(res)

src/views/supply/transferOrder/transferOrderForm.vue

@@ -138,7 +138,9 @@ export default {
       selectData: [],
       itemRecordSelected: [],
       sonCustomerList: [],
-      logisticsData: []
+      logisticsData: [],
+      sonCustomerNumberList: [],
+      sonCustomerNameList: []
     }
   },
   computed: {
@@ -152,13 +154,13 @@ export default {
         {
           name: 'el-input',
           md: 6,
-          attributes: { disabled: this.comDisabled, placeholder: '请输入' },
+          attributes: { disabled: true, placeholder: '请输入' },
           formItemAttributes: { label: '商家编号', prop: 'customerNumber' }
         },
         {
           name: 'el-input',
           md: 6,
-          attributes: { disabled: this.comDisabled, placeholder: '请输入' },
+          attributes: { disabled: true, placeholder: '请输入' },
           formItemAttributes: { label: '商家名称', prop: 'customerName' }
         },
         {
@@ -179,29 +181,40 @@ export default {
           attributes: { disabled: true, placeholder: '系统自动生成' },
           formItemAttributes: { label: '制单人', prop: 'createBy' }
         },
+        // {
+        //   name: 'el-input',
+        //   md: 6,
+        //   attributes: { disabled: this.comDisabled, placeholder: '请输入' },
+        //   formItemAttributes: { label: '商家编号', prop: 'transferCustomerNumber' }
+        // },
+        // {
+        //   name: 'el-input',
+        //   md: 6,
+        //   attributes: { disabled: this.comDisabled, placeholder: '请输入' },
+        //   formItemAttributes: { label: '商家名称', prop: 'transferCustomerName' }
+        // },
         {
-          name: 'el-input',
+          name: 'el-select',
+          options: this.sonCustomerNumberList,
           md: 6,
-          attributes: { disabled: this.comDisabled, placeholder: '请输入' },
+          attributes: {
+            clearable: true,
+            filterable: true,
+            disabled: this.comDisabled
+          },
           formItemAttributes: { label: '商家编号', prop: 'transferCustomerNumber' }
         },
         {
-          name: 'el-input',
+          name: 'el-select',
+          options: this.sonCustomerNameList,
           md: 6,
-          attributes: { disabled: this.comDisabled, placeholder: '请输入' },
+          attributes: {
+            clearable: true,
+            filterable: true,
+            disabled: this.comDisabled
+          },
           formItemAttributes: { label: '商家名称', prop: 'transferCustomerName' }
         },
-        // {
-        //   name: 'el-select',
-        //   options: this.sonCustomerList,
-        //   md: 6,
-        //   attributes: {
-        //     clearable: true,
-        //     filterable: true,
-        //     disabled: this.comDisabled
-        //   },
-        //   formItemAttributes: { label: '商家名称', prop: 'transferCustomerName' }
-        // },
         {
           name: 'el-select',
           md: 6,
@@ -525,7 +538,7 @@ export default {
     }
   },
   mounted() {
-    // this.getStagecustomerListV2()
+    this.getStagecustomerListV2()
     if (this.detailsId) {
       getCustomerTransferDetail({ id: this.detailsId }).then(res => {
         this.formData = res.data
@@ -595,18 +608,24 @@ export default {
         pageSize: -1,
         params: [
           {
-            param: 'a.higher_prant_id',
-            compare: 'like',
+            param: 'a.higher_prant_number',
+            compare: '=',
             value: this.customerNumber || ''
           }
         ]
       }).then(res => {
-        this.sonCustomerList = res.data.records.map(k => {
+        this.sonCustomerNameList = res.data.records.map(k => {
           return {
             label: k.name,
             value: k.name
           }
         })
+        this.sonCustomerNumberList = res.data.records.map(k => {
+          return {
+            label: k.number,
+            value: k.number
+          }
+        })
       })
     },
     handleAddData() {
@@ -674,6 +693,9 @@ export default {
       this.$refs.pageRef &&
         this.$refs.pageRef.$children[0].$children[0].$children[2].$children[0].$children[0].clearSelection()
     },
+    handleChangeNumber(e){
+      console.log(e);
+    },
     handlerefreshList() {
       this.$emit('refresh')
       this.onClose()