apply-clients 7.1.36-1 → 7.1.36-yuchuan-2

package/src/components/product/Supervisory/SupervisoryList.vue

@@ -70,20 +70,19 @@
               <v-select
                 v-model="model.f_apply_type"
                 placeholder='报建类型'
-                condition="f_apply_type = '{}'"
+                condition="u.f_apply_type in {}"
                 :value.sync="model.f_apply_type"
                 :options='$parent.$parent.applytype'
                 class="select select_list"
-                :value-single="true"
-                @change="$parent.$parent.applyTypeChange()"
-                close-on-select ></v-select>
+                multiple
+                @change="$parent.$parent.applyTypeChange()"></v-select>
             </div>
             <div class="form-group col-sm-2">
               <label class="font_normal_body">办理环节：</label>
               <v-select
                 v-model="model.defname"
                 placeholder='办理环节'
-                condition="defname = '{}'"
+                condition="act.defname = '{}'"
                 :value.sync="model.defname"
                 :options='$parent.$parent.defnames'
                 class="select select_list"
@@ -119,7 +118,7 @@
               <v-select
                 v-model="model.f_user_type"
                 placeholder='普通/煤改'
-                condition="(f_user_type = '{}' or f_user_type is null)"
+                condition="f_user_type = '{}'"
                 :value.sync="model.f_user_type"
                 :options='$parent.$parent.UserType'
                 class="select select_list"
@@ -188,6 +187,53 @@
                           condition="u.f_release_date <= '{}'">
               </datepicker>
             </div>
+            <div class="form-group col-sm-2">
+              <label  for="startDate" class="font_normal_body">回单日期：</label>
+              <datepicker id="startDate1" placeholder="回单开始日期"
+                          style="width: 60%!important;"
+                          v-model="model.startDate2"
+                          :value.sync="model.startDate2"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="true"
+                          condition="u.f_outdoors_receipt_time >= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-2">
+              <label for="endDate" class="font_normal_body">回单日期：</label>
+              <datepicker id="endDate1" placeholder="回单截止日期"
+                          style="width: 60%!important;"
+                          v-model="model.endDate2"
+                          :value.sync="model.endDate2"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="true"
+                          condition="u.f_outdoors_receipt_time <= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">派工类型：</label>
+              <v-select
+                v-model="model.f_dispatching_type"
+                placeholder='工队/维修'
+                condition="u.f_dispatching_type = '{}'"
+                :value.sync="model.f_dispatching_type"
+                :options='$parent.$parent.dispatching'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-2">
+              <label class="font_normal_body">新旧报建：</label>
+              <v-select
+                v-model="model.f_house_type"
+                placeholder='新旧报建'
+                condition="u.f_house_type {}"
+                :value.sync="model.f_house_type"
+                :options='$parent.$parent.houseType'
+                class="select select_list"
+                :value-single="true"
+                close-on-select >
+              </v-select>
+            </div>
             <div class="form-group col-sm-2">
               <label class="font_normal_body">来&emsp;&emsp;源：</label>
               <v-select
@@ -227,52 +273,52 @@
         </template>
         <template partial='body'>
           <tr>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{$index+1}}</nobr>
             </td>
-            <td style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_apply_num}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_user_name}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_contact}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_contract_number}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_phone}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr><font>{{row.f_designer_people}}</font></nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_apply_type}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_apply_nature}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_user_type}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.defname}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_user_classification}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_address}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_apply_source}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_sub_state}}</nobr>
             </td>
-            <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
+            <td @dblclick="$parent.$parent.$parent.check(row)" style="text-align: center;">
               <nobr>{{row.f_apply_date}}</nobr>
             </td>
           </tr>
@@ -303,6 +349,8 @@
         UserList:[{label: '全部', value: ''}, ...this.$appdata.getParam('用户分类')],
         UserType:[{label: '全部', value: ''}, {label: '普通用户', value: '普通用户'}, {label: '煤改用户', value: '煤改用户'}],
         designerPeoples:  this.getDesigner(),
+        dispatching:  [{label: '全部', value: ''}, {label: '施工工队', value: '施工工队'}, {label: '安检维修中心', value: '安检维修中心'}],
+        houseType:[{label: '全部', value: ''}, {label: '旧报建', value: ` = '旧报导入'`}, {label: '新报建', value: ' is null' }],
         getfield: {
           'f_apply_num': ' 工 程 编 号 ',
           'f_charge_date': ' 收 费 日 期 ',
@@ -344,7 +392,8 @@
           'f_apply_source': ' 来源 ',
           'f_apply_type': ' 报 建 类 型 ',
           'f_sub_state': ' 流 程 状 态 ',
-          'f_apply_date': ' 报 建 日 期 '
+          'f_apply_date': ' 报 建 日 期 ',
+          'f_house_type': ' 新 旧 报 建 '
         },
         civil: {
           'f_apply_num': '工程编号',
@@ -359,7 +408,8 @@
           'f_construct_operator': '现场项目负责人',
           'f_contact': '联系人',
           'f_phone': '电话',
-          'f_construction_unit':'施工单位'
+          'f_construction_unit':'施工单位',
+          'f_house_type': ' 新 旧 报 建 '
         },
         uncivil: {
           'f_apply_num': '工程编号',
@@ -391,13 +441,14 @@
           'f_outdoors_receipt_time': ' 户内回单日期 ',
           'f_courtyard_time': ' 庭院出单日期 ',
           'f_courtyard_receipt_time': ' 庭院回单日期 ',
-          'f_construction_unit':'施工单位'
+          'f_construction_unit':'施工单位',
+          'f_house_type': ' 新 旧 报 建 '
         }
       }
     },
     ready () {
       // 调用查询
-      this.search()
+      // this.search()
     },
     events: {
     },
@@ -462,6 +513,7 @@
       clear () {
         Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
           this.$refs.cp.$refs.cri.model[key] = null
+          this.$refs.cp.$refs.cri.model.f_apply_type = []
         })
       }
     },

package/src/main.js

@@ -1,27 +1,27 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import {ldap} from 'ldap-clients'
-import {system} from 'system-clients'
-import {sale} from 'sale-client'
-import {material} from 'material-client'
-import {fadada} from 'fadada-clients'
-import { weixinManage } from 'weixin-manage-client'
-
-import apply from './apply'
-
-all()
-weixinManage('yuchuan', 'test')
-apply()
-ldap()
-sale()
-material()
-system(false, 'yuchuan')
-fadada()
-
-require('system-clients/src/styles/less/bootstrap.less')
-require('./expandcss.less')
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import {ldap} from 'ldap-clients'
+import {system} from 'system-clients'
+import {sale} from 'sale-client'
+import {material} from 'material-client'
+import {fadada} from 'fadada-clients'
+import { weixinManage } from 'weixin-manage-client'
+
+import apply from './apply'
+
+all()
+weixinManage('yuchuan', 'test')
+apply()
+ldap()
+sale()
+material()
+system(false, 'yuchuan')
+fadada()
+
+require('system-clients/src/styles/less/bootstrap.less')
+require('./expandcss.less')
+new Vue({
+  el: 'body',
+  components: { App }
+})