apply-clients 3.4.93 → 3.4.94

package/build/dev-server.js

@@ -8,8 +8,8 @@ var compiler = webpack(config)
 // var proxy = httpProxy.createProxyServer()
 // var ldap = 'http://121.36.79.201:8400'
 // var applyinstall = 'http://121.36.79.201:8400'
-var ldap = 'http://125.71.238.50:30789'
-var applyinstall = 'http://125.71.238.50:30789'
+var ldap = 'http://192.168.50.4:8400'
+var applyinstall = 'http://192.168.50.4:8400'
 
 var proxyTable = {
   '/rs/logic/getSaleInitData': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.4.93",
+  "version": "3.4.94",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/filiale/yangchunboneng/pc/ApplyChargeList.vue

@@ -209,6 +209,17 @@
                 :value-single="true"
                 close-on-select ></v-select>
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">是否确认：</label>
+              <v-select
+                v-model="model.f_confirm"
+                placeholder='请选择'
+                :value.sync="model.f_confirm"
+                class="select select_list"
+                :options='$parent.$parent.confirms'
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">确&ensp;认&ensp;人：</label>
               <input type="text" style="width: 60%"
@@ -265,6 +276,7 @@
             <th style="white-space: nowrap;">收费日期(退款日期)</th>
             <th style="white-space: nowrap;">确认人</th>
             <th style="white-space: nowrap;">确认日期</th>
+            <th style="white-space: nowrap;">备注</th>
             <th style="white-space: nowrap;">实际收费时间</th>
             <th style="white-space: nowrap;">状态</th>
           </tr>
@@ -331,6 +343,9 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_confirm_date}}</font></nobr>
             </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_charge_remarks}}</font></nobr>
+            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_actual_date}}</font></nobr>
             </td>
@@ -369,6 +384,11 @@ export default {
         {label: '作废', value: '作废'},
         {label: '退款', value: '退款'}
       ],
+      confirms: [
+        {label: '全部', value: ''},
+        {label: '是', value: '是'},
+        {label: '否', value: '否'}
+      ],
       criteriaShow: false,
       chargeAll: {
         count: 0,
@@ -392,6 +412,7 @@ export default {
         'f_actual_date': '实际收费时间',
         'f_confirm_person': '确认人',
         'f_confirm_date': '确认时间',
+        'f_charge_remarks': '备注',
         'f_charge_status': '状态'
       }
     }
@@ -459,6 +480,15 @@ export default {
       if (this.curuserid.length > 0) {
         args.condition = args.condition + ` and cr.f_charge_collectors_id in (${this.curuserid})`
       }
+      if (args.model.f_confirm){
+        if (args.model.f_confirm == '是'){
+          args.condition = args.condition + ` and cr.f_confirm_person is not null`
+        }
+        if (args.model.f_confirm == '否'){
+          args.condition = args.condition + ` and cr.f_confirm_person is  null`
+        }
+
+      }
       this.model.search(args.condition, args.model)
     },
     // 查询