apply-clients 3.5.6-2 → 3.5.6-21

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

@@ -1899,6 +1899,10 @@
           }
         }
         if(this.show_data.defname === '工程派工' ){
+          if(isEmpty(this.show_data.f_budget_people) || this.show_data.f_budget_people.length === 0){
+            this.$showMessage('请选择施工人员！')
+            return
+          }
           this.show_data.f_budget_peoples = []
           for (const item of this.show_data.fields) {
             if (item.label === '施工人') {

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

@@ -279,6 +279,28 @@
                           condition="f_acceptance_time <= '{}'">
               </datepicker>
             </div>
+            <div class="form-group col-sm-3">
+              <label  for="checkstart" class="font_normal_body">派工时间：</label>
+              <datepicker id="checkstart" placeholder="开始日期"
+                          style="width: 60%!important;"
+                          v-model="model.paigongstartDate"
+                          :value.sync="model.paigongstartDate"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="true"
+                          condition="actend6.finishtime >= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label for="checkend" class="font_normal_body">派工时间：</label>
+              <datepicker id="checkend" placeholder="结束日期"
+                          style="width: 60%!important;"
+                          v-model="model.paigongendDate"
+                          :value.sync="model.paigongendDate"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="true"
+                          condition="actend6.finishtime <= '{}'">
+              </datepicker>
+            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">施工人：</label>
               <input type="text" style="width:60%" class="input_search" placeholder='施工人' v-model="model.f_budget_people"
@@ -323,6 +345,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>
             <th style="white-space: nowrap;">合同审批人</th>
@@ -339,7 +362,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>
             <th style="white-space: nowrap;">发起人</th>
           </tr>
@@ -388,6 +411,9 @@
             <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_finish_date}}</nobr>
             </td>
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
+              <nobr>{{row.f_budget_people}}</nobr>
+            </td>
             <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_shenqing_person}}</nobr>
             </td>
@@ -437,7 +463,7 @@
               <nobr>{{row.f_completion_time}}</nobr>
             </td>
             <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
-              <nobr>{{row.f_budget_people}}</nobr>
+              <nobr>{{row.f_gongcheng_tijiao}}</nobr>
             </td>
             <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_user_appraise}}</nobr>
@@ -513,7 +539,8 @@
           'f_completion_time': '开工时间',
           'f_budget_people':'施工人',
           'f_acceptance_time':'验收时间',
-          'f_user_satisfied':'服务评价'
+          'f_user_satisfied':'服务评价',
+          'f_operator':'发起人',
 
         }
       }

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

@@ -619,11 +619,14 @@
         <div class="form-group col-sm-12">
           <label class="col-sm-2 control-label">付款方式：</label>
           <div class="col-sm-10">
-            <input type="text"
-                   class="form-control input_view"
-                   style="width: 100%"
-                   readonly
-                   v-model="charge.f_payment_method" />
+            <input-select
+              placeholder='请选择' width="100%"
+              v-model="charge.f_payment_method"
+              :value.sync="charge.f_payment_method"
+              :options='paymentMethod'
+              class="select select_list"
+              :value-single="true"
+              close-on-select ></input-select>
           </div>
         </div>
         <div class="form-group col-sm-12">
@@ -831,7 +834,7 @@ export default {
           show_data.user = this.$login.f
           show_data.start_activity ='报装申请'
           show_data.xmlfilename =this.selectdata.f_apply_type
-          if (((show_data.f_apply_type == '民用散户报建流程' || show_data.f_apply_type == '民用预留户报建流程') && show_data.defname == '工程审批') || this.show_data.defname === '工程决算'){
+          if (((show_data.f_apply_type == '民用散户报建流程' || show_data.f_apply_type == '民用预留户报建流程') && show_data.defname == '工程审批') || show_data.defname === '工程决算'){
             show_data.button = {button_name:'跳过'}
           }else {
             show_data.button = {button_name:'提交'}

package/src/main.js

@@ -9,7 +9,7 @@ import {material} from 'material-client'
 import apply from './apply'
 
 all()
-apply('fugou')
+apply('jinhuang')
 ldap()
 sale()
 material()