apply-clients 3.4.3 → 3.4.4

package/src/components/product/Stop/StopApply.vue

@@ -1,36 +1,32 @@
 <template>
   <div class="flex-row">
     <div class="basic-main">
-      <div style="height: 95%">
-        <stop-apply-list v-ref:query></stop-apply-list>
-      </div>
+      <stop-apply-list v-ref:query></stop-apply-list>
     </div>
 
-    <validator name="v">
-      <modal v-if="showModal" :show.sync="showModal" backdrop="false" large>
-        <header slot="modal-header" class="modal-header">
-          <button type="button" class="close" @click="closeModal()"><span>&times;</span></button>
-          <span class="modal-title"><font size="3">撤销</font></span>
-        </header>
-        <article slot="modal-body" class="modal-body clearfix">
-          <div class="form-group" :class="[$v.f_cancel_reason.required ? 'has-error' : '']">
-            <label class="control-label-justify control-label col-sm-1">撤销原因</label>
-            <div class="col-sm-9">
-              <textarea
-                class="form-control input_view" style="width: 100%" rows="5"
-                v-model="selectdata.f_cancel_reason" :value="selectdata.f_cancel_reason"
-                v-validate:f_cancel_reason = "['required']"
-              ></textarea>
-            </div>
+    <modal v-if="showModal" :show.sync="showModal" backdrop="false" large>
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeModal()"><span>&times;</span></button>
+        <span class="modal-title"><font size="3">撤销</font></span>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div :class="data.f_cancel_reason ? '' : 'has-error'" class="form-group">
+          <label class="control-label-justify control-label col-sm-1">撤销原因</label>
+          <div class="col-sm-9">
+            <textarea
+              class="form-control input_view" style="width: 100%" rows="5"
+              v-model="data.f_cancel_reason" :value="data.f_cancel_reason"
+            ></textarea>
           </div>
-        </article>
-        <footer slot="modal-footer" class="modal-footer">
-          <button class="btn btn-primary" :disabled="!$v.valid" type="button" @click="confirmModal()">
-            确认
-          </button>
-        </footer>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button :class="!data.f_cancel_reason ? 'btn btn-default':'btn btn-primary'"
+                :disabled="!data.f_cancel_reason" type="button" @click="confirmModal()">
+          确认
+        </button>
+      </footer>
     </modal>
-    </validator>
   </div>
 </template>
 
@@ -40,7 +36,7 @@ export default {
   data () {
     return {
       showModal: false,
-      selectdata: null
+      data: null
     }
   },
   ready () {
@@ -48,13 +44,13 @@ export default {
   methods: {
     closeModal () {
       this.showModal = false
-      this.selectdata = null
+      this.data = null
 
       this.$refs.query.$refs.cp.$refs.cri.search()
     },
     async confirmModal () {
       let data = {
-        selectdata: this.selectdata,
+        data: this.data,
         user: this.$login.f
       }
 
@@ -72,7 +68,7 @@ export default {
       this.$refs.query.$refs.cp.$refs.cri.search()
     },
     'cancelStopApply' (row) {
-      this.selectdata = row
+      this.data = row
 
       this.showModal = true
     }

package/src/components/product/Stop/StopApplyList.vue

@@ -14,17 +14,16 @@
               ></res-select>
             </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_apply_num"
+              <label class="font_normal_body">工程编号：</label>
+              <input type="text" style="width:60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
                      v-on:keyup.enter="search"
                      condition="f_apply_num = '{}'">
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">项目名称：</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_entry_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_entry_name like '%{}%'" placeholder='项目名称'>
+              <label class="font_normal_body">客户名称：</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
             </div>
-
             <div class="form-group col-sm-2 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
               <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
@@ -38,14 +37,10 @@
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">客户名称：</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">联&ensp;系&ensp;人：</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_contact"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_contact like '%{}%'" placeholder='联系人'>
+              <label class="font_normal_body">联系电话：</label>
+              <input type="text" style="width:60%" class="input_search" placeholder='联系电话' v-model="model.f_phone"
+                     v-on:keyup.enter="search"
+                     condition="f_phone like '%{}%'">
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">合同编号：</label>
@@ -58,7 +53,7 @@
               <v-select
                 v-model="model.f_apply_type"
                 placeholder='报建类型'
-                condition="f_apply_type like '%{}%'"
+                condition="f_apply_type = '{}'"
                 :value.sync="model.f_apply_type"
                 :options='$parent.$parent.applytype'
                 class="select select_list"
@@ -79,10 +74,16 @@
                 close-on-select ></v-select>
             </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_phone"
-                     v-on:keyup.enter="search"
-                     condition="f_phone like '%{}%'">
+              <label class="font_normal_body">报建性质：</label>
+              <v-select
+                v-model="model.f_apply_nature"
+                placeholder='报建性质'
+                condition="f_apply_nature = '{}'"
+                :value.sync="model.f_apply_nature"
+                :options='$parent.$parent.applyNatures'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">用户地址：</label>
@@ -96,7 +97,7 @@
                           style="width: 60%!important;"
                           v-model="model.startDate"
                           :value.sync="model.startDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :format="'yyyy-MM-dd 00:00:00'"
                           :show-reset-button="true"
                           condition="f_apply_date >= '{}'">
               </datepicker>
@@ -107,7 +108,7 @@
                           style="width: 60%!important;"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :format="'yyyy-MM-dd 23:59:59'"
                           :show-reset-button="true"
                           condition="f_apply_date <= '{}'">
               </datepicker>
@@ -120,7 +121,6 @@
           <tr>
             <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>
@@ -145,9 +145,6 @@
             <td style="text-align: center;">
               <nobr>{{row.f_apply_num}}</nobr>
             </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_entry_name}}</nobr>
-            </td>
             <td style="text-align: center;">
               <nobr>{{row.f_user_name}}</nobr>
             </td>
@@ -220,6 +217,7 @@ export default {
       curorgid: [this.$login.f.orgid],
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
       defnames: [{label: '全部', value: ''}], // 流程节点
+      applyNatures: [{label: '全部', value: ''}], // 报建性质
       criteriaShow: false
     }
   },
@@ -245,8 +243,12 @@ export default {
         )
 
         this.defnames = [{label: '全部', value: ''}, ...res.data]
+
+        this.applyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)) ? [{label: '全部', value: ''}] : [{label: '全部', value: ''}, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)]
       } else {
         this.defnames = [{label: '全部', value: ''}]
+
+        this.applyNatures = [{label: '全部', value: ''}]
       }
     },
     clear () {