apply-clients 3.5.4-96 → 3.5.4-97

package/src/filiale/qianneng/pc/Applydetail.vue

@@ -167,7 +167,7 @@
                 </datepicker>
               </div>
               <div class="form-group col-sm-3">
-                <label for="ventilateEndDate" class="font_normal_body">结束时间：</label>
+          ===       <label for="ventilateEndDat' and  f_back_reason  is not  null\'''abel>
                 <datepicker id="ventilateEndDate" placeholder="通气验收结束日期"
                             style="width: 60%!important;"
                             v-model="model.ventilateEndDate"
@@ -209,6 +209,26 @@
                   :value-single="true"
                   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"
+                       v-model="model.f_apply_remarks"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="f_apply_remarks like '%{}%'" placeholder='备注'>
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">是否退回：</label>
+                <v-select
+                  v-model="model.f_back_reason"
+                  placeholder='是否退回'
+                  :value.sync="model.f_back_reason"
+                  :options='$parent.$parent.yerOrNo'
+                  class="select select_list"
+                  :value-single="true"
+                  close-on-select ></v-select>
+              </div>
             </div>
           </div>
         </criteria>
@@ -229,52 +249,56 @@
               <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>
           </template>
           <template partial='body'>
             <tr>
-              <td  style="text-align: center;">
+              <td :class="[row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
                 <nobr>{{$index+1}}</nobr>
               </td>
-              <td  style="text-align: center;">
+              <td   :class="[row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
                 <nobr>{{row.f_apply_num}}</nobr>
               </td>
-              <td  style="text-align: center;">
+              <td :class="[row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
                 <nobr>{{row.f_userinfo_code}}</nobr>
               </td>
-              <td  style="text-align: center;">
+              <td :class="[row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
                 <nobr>{{row.f_entry_number}}</nobr>
               </td>
-              <td  style="text-align: center;">
+              <td :class="[row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
-              <td  style="text-align: center;">
+              <td :class="[row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
                 <nobr>{{row.f_phone}}</nobr>
               </td>
-              <td  style="text-align: center;">
+              <td :class="[row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>
-              <td  style="text-align: center;">
+              <td :class="[row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
                 <nobr>{{row.f_apply_type}}</nobr>
               </td>
-              <td  style="text-align: center;">
+              <td :class="[row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
                 <nobr>{{row.f_apply_nature}}</nobr>
               </td>
-              <td  style="text-align: center;">
+              <td :class="[row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
                 <nobr>{{row.f_apply_date}}</nobr>
               </td>
-              <td  style="text-align: center;">
+              <td :class="[row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
                 <nobr>{{row.defname}}</nobr>
               </td>
-              <td  style="text-align: center;">
+              <td :class="[row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
                 <nobr>{{row.state}}</nobr>
               </td>
-              <td  style="text-align: center;">
+              <td :class="[row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
                 <nobr>{{row.f_person}}</nobr>
               </td>
-              <td  style="text-align: center;">
+              <td :class="[row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
                 <nobr>{{row.f_finishtime}}</nobr>
               </td>
+              <td :class="[row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
+                <nobr>{{row.f_apply_remarks}}</nobr>
+              </td>
             </tr>
           </template>
         </data-grid>
@@ -308,6 +332,11 @@ export default {
         {label: '终止', value: '终止'},
         {label: '结束', value: '结束'}
       ],
+      yerOrNo: [
+        {label: '全部', value: ''},
+        {label: '是', value: '是'},
+        {label: '否', value: '否'}
+      ],
       subStates: [
         {label: '全部', value: ''},
         {label: '新增', value: '新增'},
@@ -328,7 +357,8 @@ export default {
         'defname': '办理环节',
         'state': '办理状态',
         'f_person': '办理人',
-        'f_finishtime': '办理时间'
+        'f_finishtime': '办理时间',
+        'f_apply_remarks': '备注'
       }
     }
   },
@@ -348,6 +378,12 @@ export default {
       if (args.model.endDate) {
         args.condition += ` and (finishtime <= '${args.model.endDate}' or f_stop_date <= '${args.model.endDate}')`
       }
+      if (args.model.f_back_reason==='是') {
+        args.condition += ` and  f_back_reason  is not  null`
+      }
+      if (args.model.f_back_reason==='否') {
+        args.condition += ` and  f_back_reason  is  null`
+      }
       this.model.search(args.condition, args.model)
     },
     hidden () {
@@ -375,4 +411,7 @@ export default {
 </script>
 
 <style scoped>
+.back-style{
+  background-color: #ffa726;
+}
 </style>

package/src/filiale/qianneng/pc/InstallFunction.vue

@@ -1,188 +1,188 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <div   :class="showData ? 'top' : 'auto'">
-        <installinfoselect :show-data="showData" v-ref:query></installinfoselect>
-      </div>
-      <div v-if="showtotal" class="panel panel-info" style="height: 90%;">
-        <tabset v-ref:tabs :close="false">
-          <tab :header='selectdata.title'>
-            <function-service-control  v-ref:service :selectdata="selectdata"></function-service-control>
-          </tab>
-          <tab header='附件'>
-            <apply-upload :blodid="selectdata.f_process_id"
-                          :isupload = "true"
-                          :isdelete="true"
-                          :isusetype="true"
-                          :isremark = "true"
-                          :takeimg="true"
-                          :issearch="true"
-                          :defname="selectdata.defname"
-            >
-            </apply-upload>
-          </tab>
-        </tabset>
-      </div>
-      <div>
-        <div v-if="showSuper" style="height: 89%">
-          <div class="col-sm-2" style="margin-top: 20px">
-            <supervisory-chart :selectdata="selectdata"></supervisory-chart>
-          </div>
-          <div class="col-sm-10" style="margin-top: 20px">
-            <tabset v-ref:tabs :close="false">
-              <tab :header='selectdata.defname'>
-                <supervisory-service-control :selectdata="selectdata" :node-snapshot="true"></supervisory-service-control>
-              </tab>
-              <tab header='附件'>
-                <apply-upload :blodid="selectdata.f_process_id"
-                              :isupload = "false"
-                              :isdelete="false"
-                              :isusetype="true"
-                              :isremark = "true"
-                              :takeimg="false"
-                              :issearch="true"
-                              :defname="selectdata.defname">
-                </apply-upload>
-              </tab>
-            </tabset>
-          </div>
-          <div style="height: 1%">
-
-          </div>
-        </div>
-      </div>
-    </div>
-
-  </div>
-
-</template>
-<script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '报建管理',
-    data () {
-      return {
-        selectdata: null,
-        showtotal: false, // 控制详情显示
-        showData: true,     // 控制列表数据
-        showSuper: false,
-
-        showDataList: true
-      }
-    },
-    created () {
-      this.getConfig()
-    },
-    methods: {
-      // 获取页面配置json文件
-      async loadName () {
-        let data = {
-          workname: this.selectdata.processname
-        }
-        let res = await this.$resetpost(
-          'rs/logic/ApplyGetConfigs',
-          {data: data},
-          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
-        )
-
-        Vue.prototype.$workflow_vue = res.data
-      },
-      // 获取功能配置
-      async getConfig () {
-        let res = await this.$resetpost(
-          'rs/logic/ApplyGetFunction',
-          null,
-          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
-        )
-        Vue.prototype.$function_vue = res.data
-      }
-    },
-    events: {
-      async 'apply' (val) {
-        this.selectdata = null
-        this.selectdata = val
-        this.showSuper= false
-        // 获取配置文件
-        await this.loadName()
-        this.$refs.query.$refs.cp.pager = false
-        this.showData = false
-        this.showtotal=false
-        this.showSuper = true
-      },
-      // 刷新控制层
-      async 'breakControl' (servicedata) {
-        let http = new HttpResetClass()
-        let data = {
-          condition: `u.id = ${servicedata.id}`,
-          data: {
-            id: this.$login.f.id,
-            orgid: this.$login.f.orgid
-          }
-        }
-
-        let res = await http.load('POST', 'rs/sql/checkuserfunction', {data:data}, {
-          resolveMsg: null,
-          rejectMsg: '数据更新失败！！！'
-        })
-
-        this.showtotal = false
-
-        this.selectdata = Object.assign({}, this.selectdata, res.data[0])
-
-        this.$nextTick(() => {
-          this.showtotal = true
-        })
-      },
-      // 查询
-      'search' () {
-        // 关闭详细
-        this.showtotal = false
-        // 显示列表数据
-        this.showData = true
-        // 显示分页
-        this.$refs.query.$refs.cp.pager = true
-        // 调用查询
-        this.$refs.query.$refs.cp.$refs.cri.search()
-      },
-      'loadPage' () {
-        // 关闭详细
-        this.showtotal = false
-        // 显示列表数据
-        this.showData = true
-        // 显示分页
-        this.$refs.query.$refs.cp.pager = true
-        // 调用查询
-        this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
-      },
-      // 点击功能操作
-      'func' (funcdata, row) {
-        this.selectdata = Object.assign({}, funcdata, row)
-
-        // 关闭分页
-        this.$refs.query.$refs.cp.pager = false
-        // 关闭列表数据
-        this.showData = false
-
-        this.$nextTick(() => {
-          this.showtotal = true
-        })
-      }
-    }
-  }
-</script>
-<style scoped>
-  /*清除浮动*/
-  .clearfix:after,.clearfix:before{
-    display: table;
-  }
-  .clearfix:after{
-    clear: both;
-  }
-  .head{
-    height: auto;
-    font-weight: bold;
-    color: #000000;
-    font-family: 微软雅黑;
-  }
-</style>
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div   :class="showData ? 'top' : 'auto'">
+        <installinfoselect :show-data="showData" v-ref:query></installinfoselect>
+      </div>
+      <div v-if="showtotal" class="panel panel-info" style="height: 90%;">
+        <tabset v-ref:tabs :close="false">
+          <tab :header='selectdata.title'>
+            <function-service-control  v-ref:service :selectdata="selectdata"></function-service-control>
+          </tab>
+          <tab header='附件'>
+            <apply-upload :blodid="selectdata.f_process_id"
+                          :isupload = "true"
+                          :isdelete="true"
+                          :isusetype="true"
+                          :isremark = "true"
+                          :takeimg="true"
+                          :issearch="true"
+                          :defname="selectdata.defname"
+            >
+            </apply-upload>
+          </tab>
+        </tabset>
+      </div>
+      <div>
+        <div v-if="showSuper" style="height: 89%">
+          <div class="col-sm-2" style="margin-top: 20px">
+            <supervisory-chart :selectdata="selectdata"></supervisory-chart>
+          </div>
+          <div class="col-sm-10" style="margin-top: 20px">
+            <tabset v-ref:tabs :close="false">
+              <tab :header='selectdata.defname'>
+                <supervisory-service-control :selectdata="selectdata" :node-snapshot="true"></supervisory-service-control>
+              </tab>
+              <tab header='附件'>
+                <apply-upload :blodid="selectdata.f_process_id"
+                              :isupload = "false"
+                              :isdelete="false"
+                              :isusetype="true"
+                              :isremark = "true"
+                              :takeimg="false"
+                              :issearch="true"
+                              :defname="selectdata.defname">
+                </apply-upload>
+              </tab>
+            </tabset>
+          </div>
+          <div style="height: 1%">
+
+          </div>
+        </div>
+      </div>
+    </div>
+
+  </div>
+
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '报建管理',
+    data () {
+      return {
+        selectdata: null,
+        showtotal: false, // 控制详情显示
+        showData: true,     // 控制列表数据
+        showSuper: false,
+
+        showDataList: true
+      }
+    },
+    created () {
+      this.getConfig()
+    },
+    methods: {
+      // 获取页面配置json文件
+      async loadName () {
+        let data = {
+          workname: this.selectdata.processname
+        }
+        let res = await this.$resetpost(
+          'rs/logic/ApplyGetConfigs',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+        )
+
+        Vue.prototype.$workflow_vue = res.data
+      },
+      // 获取功能配置
+      async getConfig () {
+        let res = await this.$resetpost(
+          'rs/logic/ApplyGetFunction',
+          null,
+          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+        )
+        Vue.prototype.$function_vue = res.data
+      }
+    },
+    events: {
+      async 'apply' (val) {
+        this.selectdata = null
+        this.selectdata = val
+        this.showSuper= false
+        // 获取配置文件
+        await this.loadName()
+        this.$refs.query.$refs.cp.pager = false
+        this.showData = false
+        this.showtotal=false
+        this.showSuper = true
+      },
+      // 刷新控制层
+      async 'breakControl' (servicedata) {
+        let http = new HttpResetClass()
+        let data = {
+          condition: `u.id = ${servicedata.id}`,
+          data: {
+            id: this.$login.f.id,
+            orgid: this.$login.f.orgid
+          }
+        }
+
+        let res = await http.load('POST', 'rs/sql/checkuserfunction', {data:data}, {
+          resolveMsg: null,
+          rejectMsg: '数据更新失败！！！'
+        })
+
+        this.showtotal = false
+
+        this.selectdata = Object.assign({}, this.selectdata, res.data[0])
+
+        this.$nextTick(() => {
+          this.showtotal = true
+        })
+      },
+      // 查询
+      'search' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.$refs.cri.search()
+      },
+      'loadPage' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
+      },
+      // 点击功能操作
+      'func' (funcdata, row) {
+        this.selectdata = Object.assign({}, funcdata, row)
+
+        // 关闭分页
+        this.$refs.query.$refs.cp.pager = false
+        // 关闭列表数据
+        this.showData = false
+
+        this.$nextTick(() => {
+          this.showtotal = true
+        })
+      }
+    }
+  }
+</script>
+<style scoped>
+  /*清除浮动*/
+  .clearfix:after,.clearfix:before{
+    display: table;
+  }
+  .clearfix:after{
+    clear: both;
+  }
+  .head{
+    height: auto;
+    font-weight: bold;
+    color: #000000;
+    font-family: 微软雅黑;
+  }
+</style>