123

igirl-channel-web/app/front/vues/pages/OAjdlist/OAjdlist.html

@@ -68,12 +68,13 @@
                             <el-input v-model="name" placeholder="请输入内容"></el-input>
                         </div>
 
-                        <!-- <div><span>付款状态：</span>
+                        <div v-if="channelFrom == \'bw\'"><span>付款状态：</span>
                             <el-select v-model="paymentStatus" placeholder="请选择">
-                                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                                <el-option v-for="item in paymentStatusList" :key="item.value" :label="item.label"
+                                    :value="item.value">
                                 </el-option>
                             </el-select>
-                        </div> -->
+                        </div>
                     </div>
                     <div>
                         <el-button @click="find()" style="border: #3071fe;background: #3071fe; color: #fff;">查询

igirl-channel-web/app/front/vues/pages/OAjdlist/OAjdlist.js

@@ -17,6 +17,10 @@
                 input: "",
                 businessType: [
                     {
+                        value: '',
+                        label: '全部'
+                    },
+                    {
                         value: 'zzzc',
                         label: '自助申请'
                     },
@@ -31,6 +35,10 @@
                 ],
                 DeliveryStatus: [
                     {
+                        value: '',
+                        label: '全部'
+                    },
+                    {
                         value: 'dfwsfw',
                         label: '待服务'
                     },
@@ -110,6 +118,7 @@
                 /*input绑定值 */
                 channelServiceNo: null,
                 deliveryOrderNo: null,
+                paymentStatus: null,
                 tmName: null,
                 name: null,
                 itemName: null,
@@ -158,6 +167,21 @@
                     remark: "",
                     sveItemRateConfig: "",
                 },
+                paymentStatusList: [
+                    {
+                        value: '',
+                        label: '全部'
+                    },
+                    {
+                        value: 'yfk',
+                        label: '已付款'
+                    },
+                    {
+                        value: 'dfk',
+                        label: '待付款'
+                    },
+
+                ],
                 form1: {
                     title: "",
                     taxNum: "",
@@ -682,6 +706,8 @@
             this.CreateDate = null;
             console.log(this.CreateDate);
             this.deliveryStatus = null;
+            this.paymentStatus = null;
+            this.checkedStatus = null;
         },
         find(){
             this.indentInfo.channelServiceNo = this.channelServiceNo;
@@ -693,6 +719,7 @@
             this.indentInfo.deliveryStatus = this.checkedStatus;
             this.indentInfo.startTime = this.startTime || "";
             this.indentInfo.entTime = this.entTime || "";
+            this.indentInfo.payStatus = this.paymentStatus;
             this.handleSizeChange();
         },
         icbcReset(){

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html

@@ -68,7 +68,7 @@
                             <el-input v-model="name" placeholder="请输入内容"></el-input>
                         </div>
 
-                        <div><span>付款状态：</span>
+                        <div v-if="channelFrom == \'bw\'"><span>付款状态：</span>
                             <el-select v-model="paymentStatus" placeholder="请选择">
                                 <el-option v-for="item in paymentStatusList" :key="item.value" :label="item.label"
                                     :value="item.value">

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js

@@ -22,7 +22,7 @@
                         label: '全部'
                     },
                     {
-                        value: 'zzzc',
+                        value: 'zzsbzc',
                         label: '自助申请'
                     },
                     {