apply-clients 3.5.4-94 → 3.5.4-96

package/package.json

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

package/src/components/product/Print/BuildOrder/buildOrderList.vue

@@ -132,14 +132,14 @@
             </tr>
           </template>
           <template partial='body'>
-            <tr >
-              <td v-if="row.f_back_reason ? showRow: !showRow" style="text-align: center;">
+            <tr>
+              <td style="text-align: center;">
                 <nobr><font>{{$index+1}}</font></nobr>
               </td>
               <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
                 <nobr><font>{{row.f_apply_num}}</font></nobr>
               </td>
-              <td v-if="row.f_back_reason ? showRow: !showRow" style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
+              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
                 <nobr><font>{{row.f_user_name}}</font></nobr>
               </td>
               <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">

package/src/filiale/fugou/android/AppZhihuanManagement.vue

@@ -1,197 +1,230 @@
-<template>
-  <div class="col-sm-12" style="margin: 20px 0px;">
-    <data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
-      <template partial='head'>
-        <tr>
-          <th class="textNoLineBreak">序号</th>
-          <th class="textNoLineBreak">检查项目</th>
-          <th class="textNoLineBreak">检查结果</th>
-          <th class="textNoLineBreak">操作</th>
-        </tr>
-      </template>
-      <template partial='body'>
-        <tr>
-          <td style="text-align: center;">
-            <nobr>{{$index+1}}</nobr>
-          </td>
-          <td style="text-align: center;" >
-            <nobr>{{row.f_check_list}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>{{row.f_check_value}}</nobr>
-          </td>
-          <td style="text-align: center;">
-            <nobr>
-              <button
-                type="button"
-                name="button"
-                class="btn btn-link"
-                @click="$parent.$parent.showModal(row)"
-              >修改</button>
-            </nobr>
-          </td>
-        </tr>
-      </template>
-    </data-grid>
-    <validator name="v">
-      <modal v-if="showCheckModel" :show.sync="showCheckModel" v-ref:modal :large="true" :backdrop="false" title="收费明细">
-        <header slot="modal-header" class="modal-header">
-          <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
-          <h4 class="modal-title">检查明细</h4>
-        </header>
-        <article slot="modal-body" class="modal-body clearfix">
-          <div class="form-group col-sm-12">
-            <label class="col-sm-2 control-label">检查项目：</label>
-            <div class="col-sm-10">
-              <textarea width="100%" rows="3" readonly v-model="checkList.f_check_list"></textarea>
-            </div>
-
-          </div>
-          <div class="form-group col-sm-12" >
-            <label class="col-sm-2 control-label">检查结果：</label>
-            <div class="col-sm-10">
-              <input-select
-                placeholder='请选择' width="100%"
-                v-model="checkList.f_check_value"
-                :value.sync="checkList.f_check_value"
-                :options='item'
-                class="select select_list"
-                :value-single="true"
-                close-on-select ></input-select>
-            </div>
-          </div>
-          <app-check-take-pic
-            :blobid="selectdata.f_process_id"
-            :flag="flag"
-            :defname="selectdata.defname"
-            :isdelete="true"
-            :istakepic="true"
-            :istype="true">
-          </app-check-take-pic>
-        </article>
-        <footer slot="modal-footer" class="modal-footer">
-          <button type="button" class="btn btn-primary" :disabled='!$v.valid' @click="save()">保存</button>
-        </footer>
-      </modal>
-    </validator>
-  </div>
-</template>
-<script>
-import {HttpResetClass} from 'vue-client'
-import Vue from 'vue'
-
-export default {
-  title: '检查项管理',
-  props: {
-    selectdata: {
-      type: Object
-    },
-  },
-  data () {
-    return {
-      model: {
-        data: null
-      },
-      flag:0,
-      showCheckModel: false,
-      checkList:{},
-      item: [{label: '是', value: '是'},{label: '否', value: '否'}],
-      hasList:false,
-      savelist:[]
-    }
-  },
-  ready () {
-    this.search()
-  },
-  methods: {
-    async save(){
-      let res = await this.$resetpost(
-        `${this.$androidUtil.getProxyUrl()}/apply/rs/entity/t_apply_check`,
-        this.checkList,
-        {resolveMsg: null, rejectMsg: '数据保存失败！！！'}
-      )
-      if(res){
-        this.showCheckModel=false
-        this.search()
-      }
-    },
-    showModal(row){
-      this.checkList=row
-      this.flag=this.selectdata.f_apply_num+row.id
-      this.showCheckModel=true
-    },
-    closeModal() {
-      this.showCheckModel=false
-    },
-    //如果是第一次，则新保存检查想到数据库
-    async saveCheck() {
-      if (this.hasList === false) {
-        this.savelist = []
-        let checkList
-        if (this.selectdata.f_apply_type == '工商户报建'){
-          checkList = this.$appdata.getParam("报建非民用检查项目")
-        }else {
-          checkList = this.$appdata.getParam("报建民用检查项目")
-        }
-
-        //遍历数组,获取数组中的每一个对象，并获取对象的value
-        for (let i = 0; i < checkList.length; i++) {
-          let obj = checkList[i]
-          let value = obj.value
-          this.savelist.push(value)
-        }
-        //保存到数据库
-        let http = new HttpResetClass()
-        let data = {
-          apply: this.selectdata,
-          user: Vue.user,
-          check:this.savelist
-        }
-        let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/addApplyCheck`, {data: data}, {
-          resolveMsg: null,
-          rejectMsg: '添加失败！！！'
-        })
-      }
-    },
-    //查询
-    async search() {
-      let http = new HttpResetClass()
-      let data = {
-        tablename: 't_apply_check',
-        condition: `f_process_id= '${this.selectdata.f_process_id}'`
-      }
-      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {data:data}, {
-        resolveMsg: null,
-        rejectMsg: '检查项查询失败！！！'
-      })
-      if(res.data.length>0){
-        this.model.data=res.data
-      }else{
-        this.saveCheck()
-      }
-    }
-  },
-  events: {
-  },
-  computed: {
-    CheckItems() {
-      return this.$appdata.getParam("报建检查项目")
-    }
-  },
-  watch: {
-  }
-}
-</script>
-<style scoped>
-.textNoLineBreak {
-  white-space: nowrap;
-}
-.head-but{
-  margin-left: 5px;
-  height: 34px;
-  /*background-color: #6aa6e2;*/
-  border-radius: 4px;
-  font-family: PingFang;
-  color: #ffffff;
-}
-</style>
+<template>
+  <div class="col-sm-12" style="margin: 20px 0px;">
+    <data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
+      <template partial='head'>
+        <tr>
+          <th class="textNoLineBreak">序号</th>
+          <th class="textNoLineBreak">检查项目</th>
+          <th class="textNoLineBreak">检查结果</th>
+          <th class="textNoLineBreak">操作</th>
+          <th class="textNoLineBreak">
+            <button  style="color:black" class="button_new button_spacing" type="button" @click="$parent.$parent.getCheck()">重置
+            </button>
+          </th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr>{{$index+1}}</nobr>
+          </td>
+          <td style="text-align: center;" >
+            <nobr>{{row.f_check_list}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_check_value}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>
+              <button
+                type="button"
+                name="button"
+                class="btn btn-link"
+                @click="$parent.$parent.showModal(row)"
+              >修改</button>
+            </nobr>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+    <validator name="v">
+      <modal v-if="showCheckModel" :show.sync="showCheckModel" v-ref:modal :large="true" :backdrop="false" title="收费明细">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
+          <h4 class="modal-title">检查明细</h4>
+        </header>
+        <article slot="modal-body" class="modal-body clearfix">
+          <div class="form-group col-sm-12">
+            <label class="col-sm-2 control-label">检查项目：</label>
+            <div class="col-sm-10">
+              <textarea width="100%" rows="3" readonly v-model="checkList.f_check_list"></textarea>
+            </div>
+
+          </div>
+          <div class="form-group col-sm-12" >
+            <label class="col-sm-2 control-label">检查结果：</label>
+            <div class="col-sm-10">
+              <input-select
+                placeholder='请选择' width="100%"
+                v-model="checkList.f_check_value"
+                :value.sync="checkList.f_check_value"
+                :options='item'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></input-select>
+            </div>
+          </div>
+          <app-check-take-pic
+            :blobid="selectdata.f_process_id"
+            :flag="flag"
+            :defname="selectdata.defname"
+            :isdelete="true"
+            :istakepic="true"
+            :istype="true">
+          </app-check-take-pic>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button type="button" class="btn btn-primary" :disabled='!$v.valid' @click="save()">保存</button>
+        </footer>
+      </modal>
+    </validator>
+  </div>
+</template>
+<script>
+import {HttpResetClass} from 'vue-client'
+import Vue from 'vue'
+import co from "co";
+
+export default {
+  title: '检查项管理',
+  props: {
+    selectdata: {
+      type: Object
+    },
+  },
+  data () {
+    return {
+      model: {
+        data: null
+      },
+      flag:0,
+      showCheckModel: false,
+      checkList:{},
+      item: [{label: '是', value: '是'},{label: '否', value: '否'}],
+      hasList:false,
+      savelist:[]
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    async  flush(){
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_apply_check',
+        condition: `f_process_id= '${this.selectdata.f_process_id}'`
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '检查项查询失败！！！'
+      })
+      this.model.data=res.data
+    },
+    async getCheck(){
+      let http = new HttpResetClass()
+      this.$showMessage('是否获取最新检查项？', ['confirm', 'cancel']).then(async (res) => {
+        if (res === 'confirm') {
+          this.model.data=[]
+          let del= `delete from t_apply_check where f_process_id='${this.selectdata.f_process_id}'`
+          //删除旧的检查项，
+          await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/runSQL`, {data: {sql: del}},
+            {resolveMsg: null, rejectMsg: '删除安检册失败'})
+          //拉取新的检查项
+          await  this.saveCheck()
+          //刷新
+          await  this.flush()
+        }
+      })
+    },
+    async save(){
+      let res = await this.$resetpost(
+        `${this.$androidUtil.getProxyUrl()}/apply/rs/entity/t_apply_check`,
+        this.checkList,
+        {resolveMsg: null, rejectMsg: '数据保存失败！！！'}
+      )
+      if(res){
+        this.showCheckModel=false
+        this.search()
+      }
+    },
+    showModal(row){
+      this.checkList=row
+      this.flag=this.selectdata.f_apply_num+row.id
+      this.showCheckModel=true
+    },
+    closeModal() {
+      this.showCheckModel=false
+    },
+    //如果是第一次，则新保存检查想到数据库
+    async saveCheck() {
+      if (this.hasList === false) {
+        this.savelist = []
+        let checkList
+        if (this.selectdata.f_apply_type == '工商户报建'){
+          checkList = this.$appdata.getParam("报建非民用检查项目")
+        }else {
+          checkList = this.$appdata.getParam("报建民用检查项目")
+        }
+
+        //遍历数组,获取数组中的每一个对象，并获取对象的value
+        for (let i = 0; i < checkList.length; i++) {
+          let obj = checkList[i]
+          let value = obj.value
+          this.savelist.push(value)
+        }
+        //保存到数据库
+        let http = new HttpResetClass()
+        let data = {
+          apply: this.selectdata,
+          user: Vue.user,
+          check:this.savelist
+        }
+        let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/addApplyCheck`, {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '添加失败！！！'
+        })
+      }
+    },
+    //查询
+    async search() {
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_apply_check',
+        condition: `f_process_id= '${this.selectdata.f_process_id}'`
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '检查项查询失败！！！'
+      })
+      if(res.data.length>0){
+        this.model.data=res.data
+      }else{
+        this.saveCheck()
+      }
+    }
+  },
+  events: {
+  },
+  computed: {
+    CheckItems() {
+      return this.$appdata.getParam("报建检查项目")
+    }
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped>
+.textNoLineBreak {
+  white-space: nowrap;
+}
+.head-but{
+  margin-left: 5px;
+  height: 34px;
+  /*background-color: #6aa6e2;*/
+  border-radius: 4px;
+  font-family: PingFang;
+  color: #ffffff;
+}
+</style>

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

@@ -384,7 +384,6 @@ export default {
 })},
 
     async getapplyoperator(){
-      debugger
       let data = {
         condition: `1=1`
       }
@@ -419,7 +418,8 @@ export default {
       if (this.curuserid.length > 0) {
         args.condition = args.condition + ` and cr.f_charge_collectors_id in (${this.curuserid})`
       }
-      if(isEmpty(this.model.f_charge_status)){
+
+      if(args.model.f_charge_status.length==0){
         args.condition+=` and cr.f_charge_status in ('有效','退款')`
       }
 

package/src/filiale/yangchunboneng/android/AppServiceControl.vue

@@ -1286,11 +1286,11 @@ export default {
         {data: this.show_data},
         {resolveMsg: null, rejectMsg: '数据保存失败'}
       )
-      if(this.show_data.f_apply_type == '验收审批' && this.show_data.defname === '验收审批' && this.show_data.button.button_name === '提交'){
+      if((this.show_data.f_apply_type == '验收审批' && this.show_data.defname === '验收审批' )|| (this.show_data.f_apply_type === '工程施工' && this.show_data.defname === '工程施工'  )&& this.show_data.button.button_name === '提交'){
         const http = new HttpResetClass()
         let data = {
           tablename: 't_apply',
-          condition: `f_parent_process_id = '${this.show_data.f_parent_process_id}' and f_apply_type = '验收审批' and f_sub_state != '完工'`
+          condition: `f_parent_process_id = '${this.show_data.f_parent_process_id}' and f_apply_type in ('验收审批','工程施工')  and f_sub_state != '完工' and f_sub_state != '终止'`
         }
         await http.load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,{data: data},{rejectMsg:null,resolveMsg:null}).then( res=>{
           if (res.data.length == 0){

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

@@ -1937,7 +1937,7 @@
           const http = new HttpResetClass()
           let data = {
             tablename: 't_apply',
-            condition: `f_parent_process_id = '${this.show_data.f_parent_process_id}' and f_apply_type in ('验收审批','工程施工')  and f_sub_state != '完工'`
+            condition: `f_parent_process_id = '${this.show_data.f_parent_process_id}' and f_apply_type in ('验收审批','工程施工')  and f_sub_state != '完工' and f_sub_state != '终止'`
           }
           await http.load('post',`rs/sql/apply_singleTable`,{data: data},{rejectMsg:null,resolveMsg:null}).then( res=>{
           //判断res.data.length == 0，则子流程已经完工，然后将付流程进行到下一步