Jelajahi Sumber

【修改】 商用信息单、商用订单 页面选择应为:全部、已保存、待审核、审核通过、已关闭。不需要多选

howie 2 tahun lalu
induk
melakukan
1de05ef90d

+ 2 - 0
src/views/deposit_commerce/refund_list.vue

@@ -300,6 +300,8 @@
                 <el-tag size="mini" v-show="row.examineStatus == 'FAIL'" type="danger">不通过</el-tag>
               </template>
             </el-table-column>
+            <el-table-column align="right" label="数量" prop="hasSendQty" min-width="160" show-overflow-tooltip />
+            <el-table-column align="right" label="金额" prop="hasSendQty" min-width="160" show-overflow-tooltip />
             <el-table-column
               align="left"
               label="工程登录编号"

+ 2 - 0
src/views/deposit_home/refund_list.vue

@@ -310,6 +310,8 @@
                 <el-tag v-show="row.examineStatus == 'FAIL'" size="mini" type="danger">不通过</el-tag>
               </template>
             </el-table-column>
+            <el-table-column align="right" label="数量" prop="hasSendQty" min-width="160" show-overflow-tooltip />
+            <el-table-column align="right" label="金额" prop="hasSendQty" min-width="160" show-overflow-tooltip />
             <el-table-column
               align="left"
               label="工程登录编号"

+ 10 - 9
src/views/supply/engin/commerce_list.vue

@@ -9,11 +9,12 @@
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
           </template>
           <template #left_btn>
-            <el-checkbox-group v-model="screenForm.status" @change="getList()" size="mini">
-              <el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
+            <el-radio-group size="mini" v-model="screenForm.status" @change="getList()">
+              <el-radio-button label="">全部</el-radio-button>
+              <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
                 item.label
-              }}</el-checkbox-button>
-            </el-checkbox-group>
+              }}</el-radio-button>
+            </el-radio-group>
           </template>
           <template #search>
             <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
@@ -548,7 +549,7 @@ export default {
       listLoading: false, // 列表加载loading
       screenForm: {
         // 筛选表单数据
-        status: [],
+        status: '',
         orderNum: '',
         enginNum: '',
         loginNum: '',
@@ -567,9 +568,9 @@ export default {
       statusList: [
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
-        { label: '审核通过', value: 'OK' }
+        { label: '审核通过', value: 'OK' },
         //  // { label: '审核驳回', value: 'FAIL' },,
-        // { label: '已关闭', value: 'CLOSE' },
+        { label: '已关闭', value: 'CLOSE' }
       ],
       salesmanList: [],
       salesTypeList: [],
@@ -600,7 +601,7 @@ export default {
         return item.enginOrderNo
       })
       return {
-        examineStatus: this.screenForm.status.join(','),
+        examineStatus: this.screenForm.status,
         enginOrderNo: ids && ids.length ? ids.join(',') : this.screenForm.orderNum,
         refProjectNo: this.screenForm.enginNum,
         refEnginRecordNo: this.screenForm.loginNum,
@@ -674,7 +675,7 @@ export default {
       let params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        examineStatus: this.screenForm.status.join(','),
+        examineStatus: this.screenForm.status,
         enginOrderNo: this.screenForm.orderNum,
         refProjectNo: this.screenForm.enginNum,
         refEnginRecordNo: this.screenForm.loginNum,

+ 11 - 9
src/views/supply/engin/engin_list.vue

@@ -9,11 +9,12 @@
             <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
           </template>
           <template #left_btn>
-            <el-checkbox-group v-model="screenForm.status" @change="getList()" size="mini">
-              <el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
+            <el-radio-group size="mini" v-model="screenForm.status" @change="getList()">
+              <el-radio-button label="">全部</el-radio-button>
+              <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
                 item.label
-              }}</el-checkbox-button>
-            </el-checkbox-group>
+              }}</el-radio-button>
+            </el-radio-group>
           </template>
           <template #search>
             <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
@@ -496,7 +497,7 @@ export default {
         company: '',
         createMan: '',
         examineMan: '',
-        status: [],
+        status: '',
         salesMan: '',
         model: '',
         orderDate: '',
@@ -505,10 +506,11 @@ export default {
       statusList: [
         { label: '已保存', value: 'SAVE' },
         { label: '待审核', value: 'WAIT' },
-        { label: '审核通过', value: 'OK' }
+        { label: '审核通过', value: 'OK' },
         //  // { label: '审核驳回', value: 'FAIL' },,
-        // { label: '已关闭', value: 'CLOSE' },
+        { label: '已关闭', value: 'CLOSE' }
       ],
+
       salesmanList: [],
       transfer: [
         { label: '是', value: true },
@@ -547,7 +549,7 @@ export default {
         useUnit: this.screenForm.company,
         createName: this.screenForm.createMan,
         confirmName: this.screenForm.examineMan,
-        examineStatus: this.screenForm.status.join(','),
+        examineStatus: this.screenForm.status,
         serviceId: this.screenForm.salesMan,
         specification: this.screenForm.model,
         isDirectTransfer: this.screenForm.isDirectTransfer
@@ -620,7 +622,7 @@ export default {
         useUnit: this.screenForm.company,
         createName: this.screenForm.createMan,
         confirmName: this.screenForm.examineMan,
-        examineStatus: this.screenForm.status.join(','),
+        examineStatus: this.screenForm.status,
         serviceId: this.screenForm.salesMan,
         specification: this.screenForm.model,
         isDirectTransfer: this.screenForm.isDirectTransfer