apply-clients 4.1.2 → 4.1.3-weinan

package/src/components/product/Process/ShowBackReason.vue

@@ -26,6 +26,7 @@
           rejectMsg: null
         })
         this.data = res.data[0]
+        console.log("ce",this.data)
       }
     }
   }

package/src/components/product/ServiceView.vue

@@ -181,7 +181,7 @@
         </div>
 
         <div v-for="(i,item) in data.components">
-          <component :is="item.name" :selectdata="data" :mark="item.mark"></component>
+          <component :is="item.name" :selectdata="data" :mark="item.mark" ></component>
         </div>
 
         <!--自定义组件-->
@@ -320,6 +320,7 @@
 </template>
 <script>
   import Vue from 'vue'
+  import {HttpResetClass, PagedList} from "vue-client";
   // Date格式化
   Date.prototype.Format = function (fmt) {
     var o = {
@@ -349,7 +350,7 @@
         default: true
       }
     },
-    data () {
+    data() {
       return {
         model: {}, // 公司等属性
         disable_button: true, // 控制按钮禁用
@@ -360,15 +361,18 @@
         modeltitle: null, // 模态框标题
         modalSize: null, // 模态框大小
         showbutmodal: false,
+        showcheck: false,
+        back: '',
       }
     },
-    watch: {
-      deep: true
+    ready() {
+      console.log("7777777")
+      console.log(this.data)
     },
-    computed: {
-
+    watch: {
+      deep: true,
     },
-    created () {
+    created() {
       // 初始化数据
       this.initializtion()
       this.$dispatch('initializtionView')
@@ -388,6 +392,9 @@
       // 点击按钮组按钮
       async clicked(index, button) {
         this.disable_button = true
+        console.log("this.data")
+        console.log(this.data)
+        console.log(button)
         // 组织model.fields数据
         for (const item of this.data.fields) {
           // checkbox特殊处理
@@ -416,18 +423,59 @@
         this.model.title = this.data.title
         this.model.fields = this.data.fields
         this.model.onetomany = this.data.onetomany
-
-
+        if (this.data.defname === '通气点火') {
+          if (this.data.processname === '工商户报建流程' || this.data.processname === '开发商集体报建流程') {
+            let http = new HttpResetClass()
+            let condition = `f_blobid = '${this.data.f_process_id}'`
+            let res = await http.load('POST', 'rs/sql/singleTable', {
+              data: {
+                tablename: 't_files',
+                condition: condition
+              }
+            }, {resolveMsg: null, rejectMsg: null})
+            console.log("res_________________")
+            console.log(res)
+            if (res.data.length === 0) {
+              this.$showMessage("未上传图纸")
+              return
+            }
+          }
+        }
+        // if (this.data.defname === '合同签订') {
+        // console.log("ddddd",this.data)
+        // }
+        // if (this.data.defname === '竣工验收') {
+        //   // if (this.data.processname !== '工商户报建流程') {
+        //   //     let t=this.selecteddd
+        //   //     let diff = this.all.filter(function (val) {
+        //   //       return t.indexOf(val) === -1
+        //   //     })
+        //   //     console.log("diff", diff)
+        //   //     for(let index = 0;index < diff.length; index++){
+        //   //       let data = {
+        //   //         code:diff[index].f_userinfo_code
+        //   //       }
+        //   //       console.log("code", data.code)
+        //   //       let http = new HttpResetClass()
+        //   //       http.load('POST', 'rs/logic/batchcheck', {data:data}, {resolveMsg: null, rejectMsg: null})
+        //   //
+        //   //   }
+        //   // }
+        // }
         if (button.button_name === '退回') {
           this.showbutmodal = true
         } else if (button.button_name === '下发') {
           this.showbutmodal = true
+        } else if (button.button_name === '验收') {
+          this.showbutmodal = true
+        } else if (button.event) {
+          this.$dispatch(button.event)
         } else {
           this.$dispatch('button', this.model)
         }
       },
       // 初始化数据
-      initializtion () {
+      initializtion() {
         // 是否禁用按钮
         this.disableButton()
 
@@ -437,7 +485,6 @@
             item.value = new Date().Format('yyyy-MM-dd HH:mm:ss')
           }
         }
-
         // 公司等属性初始化
         if (this.data.filiale) {
           this.model.f_filiale = this.data.filiale
@@ -461,7 +508,7 @@
         }
       },
       // 是否禁用按钮
-      disableButton () {
+      disableButton() {
         let fields = this.data.fields
 
         let flag = false
@@ -474,7 +521,7 @@
             }
           }
           // 任何选择框只要是否都不能提交
-          if (item.type === 'select' && item.value === '否' && item.disabledButton) {
+          if (item.type === 'select' && (item.value === '否' || item.value === '未开工') && item.disabledButton) {
             flag = true
           }
         }
@@ -492,23 +539,23 @@
         this.disable_button = flag
       },
       // 失去焦点触发，无论值是否发生变化
-      onblur (index) {
+      onblur(index) {
         // 是否禁用按钮
         this.disableButton()
 
         this.$dispatch('onblur', index)
         // 如果有错误信息提示走错误信息判断处理
 
-        if (this.data.fields[index].error || this.data.fields[index].type === 'datepicker') {
+        if (this.data.fields[index].error && this.data.fields[index].type === 'datepicker') {
           this.$dispatch('error_check', index)
         }
       },
       // 失去焦点且值最终发生变化触发
-      onchange (index) {
+      onchange(index) {
         // 是否禁用按钮
         this.disableButton()
 
-        this.data.fields[index].value = this.data.fields[index].value.trim()
+        // this.data.fields[index].value = this.data.fields[index].value.trim()
 
         if (this.data.fields[index].prefix && this.data.fields[index].value !== '') {
           this.data.fields[index].value = this.data.fields[index].prefix + this.data.fields[index].value
@@ -516,26 +563,29 @@
 
         this.data[this.data.fields[index].field] = this.data.fields[index].value
 
+        if (this.data.fields[index].onchange) {
+          this.$dispatch(this.data.fields[index].onchange, index)
+        }
         this.$dispatch('onchange', index)
 
         // 如果有错误信息提示走错误信息判断处理
-        if (this.data.fields[index].error || this.data.fields[index].type === 'datepicker') {
+        if (this.data.fields[index].error && this.data.fields[index].type === 'datepicker') {
           this.$dispatch('error_check', index)
         }
       },
-      oninput (index) {
+      oninput(index) {
         // 是否禁用按钮
         this.disableButton()
 
         this.$dispatch('oninput', index)
 
         // 如果有错误信息提示走错误信息判断处理
-        if (this.data.fields[index].error || this.data.fields[index].type === 'datepicker') {
+        if (this.data.fields[index].error && this.data.fields[index].type === 'datepicker') {
           this.$dispatch('error_check', index)
         }
       },
       // 模态框确认按钮
-      confirm_modal (title) {
+      confirm_modal(title) {
         if (title === '新增') {
           if (this.data.onetomany[this.onetomany_index].addEvent === 'default' || !this.data.onetomany[this.onetomany_index].addEvent) {
             this.$dispatch('onetomanyadd', this.onetomany_index)
@@ -553,7 +603,7 @@
         this.closemodal()
       },
       // 删除
-      delete (i, j) {
+      delete(i, j) {
         this.$showMessage((this.data.onetomany[i].deleteMessage === 'default' || !this.data.onetomany[i].deleteMessage) ? '您确定要删除这条记录吗？' : this.data.onetomany[i].deleteMessage, ['confirm']).then((res) => {
           if (res === 'confirm') {
             if (this.data.onetomany[i].deleteEvent === 'default' || !this.data.onetomany[i].deleteEvent) {
@@ -565,7 +615,7 @@
         })
       },
       // 修改
-      update (i, j) {
+      update(i, j) {
         let onetomany = this.data.onetomany[i]
         let item = this.data.onetomany[i].rows[j]
         let count = 0
@@ -585,12 +635,12 @@
         this.onetomany_index = i
         this.update_onetomany_index = j
 
-        this.$dispatch('openUpdateModel',i,j)
+        this.$dispatch('openUpdateModel', i, j)
 
         this.show = true
       },
       // 添加
-      add (index) {
+      add(index) {
         let count = 0
         for (const item of this.data.onetomany[index].fields) {
           if (item.type === 'datepicker') {
@@ -608,13 +658,13 @@
         this.modalSize = this.data.onetomany[index].modalSize
         this.onetomany_index = index
 
-        this.$dispatch('openAddModel',index)
+        this.$dispatch('openAddModel', index)
 
         this.show = true
       },
       // 关闭模态框
-      closemodal (val) {
-        if (val === 'but'){
+      closemodal(val) {
+        if (val === 'but') {
           this.disableButton()
           this.showbutmodal = false
           return
@@ -630,7 +680,7 @@
         this.modalSize = null
       },
       // 是否禁用模态框按钮
-      disableModalButton () {
+      disableModalButton() {
         let fields = this.data.onetomany[this.onetomany_index].fields
 
         let flag = false
@@ -656,23 +706,20 @@
         this.disable_button_onetomany = flag
       },
       // 监听模态框属性失去焦点
-      onchange_modal (index) {
+      onchange_modal(index) {
         this.disableModalButton()
         this.$dispatch('onchange_modal', this.onetomany_index, index)
       },
       // 监听模态框属性失去焦点
-      onblur_modal (index) {
+      onblur_modal(index) {
         this.disableModalButton()
         this.$dispatch('onblur_modal', this.onetomany_index, index)
       },
       // input输入属性值发生变化监听
-      oninput_modal (index) {
+      oninput_modal(index) {
         this.disableModalButton()
         this.$dispatch('oninput_modal', this.onetomany_index, index)
       }
-    },
-    events: {
-
     }
   }
 </script>

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

@@ -0,0 +1,101 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <stop-apply-list v-ref:query></stop-apply-list>
+    </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>
+        </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>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '终止报建',
+  data () {
+    return {
+      showModal: false,
+      data: null
+    }
+  },
+  ready () {
+  },
+  methods: {
+    closeModal () {
+      this.showModal = false
+      this.data = null
+
+      this.$refs.query.$refs.cp.$refs.cri.search()
+    },
+    async confirmModal () {
+      let data = {
+        data: this.data,
+        user: this.$login.f
+      }
+
+      let res = await this.$resetpost(
+        `rs/logic/cancelStopApply`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '撤销失败！！！'}
+      )
+
+      this.closeModal()
+    }
+  },
+  events: {
+    'search' () {
+      this.$refs.query.$refs.cp.$refs.cri.search()
+    },
+    'cancelStopApply' (row) {
+      this.data = row
+
+      this.showModal = true
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .control-label-justify {
+    display: inline-block;
+    vertical-align: top;
+    width: 110px;
+    text-align: justify;
+    font-family: PingFang-SC-Bold;
+  }
+
+  .control-label-justify::after {
+    content: "";
+    display: inline-block;
+    width: 100%;
+    overflow: hidden;
+    height: 0;
+  }
+  .clearfix:after,.clearfix:before{
+    display: table;
+  }
+  .clearfix:after{
+    clear: both;
+  }
+</style>

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

@@ -0,0 +1,257 @@
+<template>
+  <div class="col-sm-12">
+    <criteria-paged :model="model" v-ref:cp>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+<!--            <div class="form-group col-sm-3">-->
+<!--              <label class="font_normal_body">组织机构：</label>-->
+<!--              <res-select-->
+<!--                restype='organization'-->
+<!--                :initresid='$parent.$parent.curorgid'-->
+<!--                @res-select="$parent.$parent.getorg"-->
+<!--                is-mul="false"-->
+<!--              ></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_entry_name"
+                     v-on:keyup.enter="search"
+                     condition="u.f_entry_name = '{}'">
+            </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"
+                     v-on:keyup.enter="search"
+                     condition="u.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_user_name"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="u.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>
+              <div
+                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
+                class="button_spacing"
+                style="float: right">
+              </div>
+            </div>
+          </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" placeholder='联系电话' v-model="model.f_phone"
+                     v-on:keyup.enter="search"
+                     condition="u.f_phone like '%{}%'">
+            </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_contract_number"
+                     v-on:keyup.enter="search"
+                     condition="u.f_contract_number = '{}'">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">报建类型：</label>
+              <v-select
+                v-model="model.f_apply_type"
+                placeholder='报建类型'
+                condition="u.f_apply_type = '{}'"
+                :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>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">办理环节：</label>
+              <v-select
+                v-model="model.defname"
+                placeholder='办理环节'
+                condition="defname = '{}'"
+                :value.sync="model.defname"
+                :options='$parent.$parent.defnames'
+                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>
+              <input type="text" style="width:60%" class="input_search" placeholder='用户地址' v-model="model.f_address"
+                     v-on:keyup.enter="search"
+                     condition="u.f_address like '%{}%'">
+            </div>
+            <div class="form-group col-sm-3">
+              <label  for="startDate" class="font_normal_body">开始时间：</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          style="width: 60%!important;"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="true"
+                          condition="u.f_apply_date >= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label for="endDate" class="font_normal_body">结束时间：</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          style="width: 60%!important;"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="true"
+                          condition="u.f_apply_date <= '{}'">
+              </datepicker>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+        <template partial='head'>
+          <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>
+            <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>-->
+<!--            <th style="white-space: nowrap;">操作</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_apply_num}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_user_name}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_phone}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_apply_type}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.defname}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_state}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_stop_remarks}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_date}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_operator}}</nobr>
+            </td>
+<!--            <td style="text-align: center;">-->
+<!--              <nobr>{{row.f_cancel_reason}}</nobr>-->
+<!--            </td>-->
+<!--            <td style="text-align: center;">-->
+<!--              <nobr>{{row.f_cancel_date}}</nobr>-->
+<!--            </td>-->
+<!--            <td style="text-align: center;">-->
+<!--              <nobr>{{row.f_cancel_name}}</nobr>-->
+<!--            </td>-->
+<!--            <td style="text-align: center;">-->
+<!--              <dropdown v-if="row.f_type === '暂停报建' && row.f_state === '有效'">-->
+<!--                <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">-->
+<!--                  <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>-->
+<!--                </button>-->
+<!--                <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">-->
+<!--                  <li>-->
+<!--                    <a href="#" @click="$parent.$parent.$parent.click(row)">撤销</a>-->
+<!--                  </li>-->
+<!--                </ul>-->
+<!--              </dropdown>-->
+<!--            </td>-->
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+import {isEmpty} from '../../Util'
+export default {
+  title: '终止报建',
+  data () {
+    return {
+      model: new PagedList('rs/sql/getStopApply', 20, {
+        data: {
+          orgid: this.$login.f.orgid
+        }
+      }),
+      curorgid: [this.$login.f.orgid],
+      applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+      defnames: [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')], // 流程节点
+      applyNatures: [{label: '全部', value: ''}], // 报建性质
+      criteriaShow: false
+    }
+  },
+  ready () {
+    // 调用查询
+    this.search()
+  },
+  events: {
+  },
+  methods: {
+    // 查询
+    search () {
+      this.$dispatch('search')
+    },
+    click (row) {
+      this.$dispatch('cancelStopApply', row)
+    },
+    async applyTypeChange () {
+      if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
+        let res = await this.$resetpost('rs/logic/getDefnameByType',
+          { f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type },
+          {resolveMsg: null, rejectMsg: '节点信息获取失败！！！'}
+        )
+
+        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.$appdata.getParam('办理环节')]
+
+        this.applyNatures = [{label: '全部', value: ''}]
+      }
+    },
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = null
+      })
+    },
+    getorg (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.model.params.data.orgid = val[0]
+    }
+  },
+  computed: {
+  }
+}
+</script>
+<style scoped>
+</style>

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

@@ -80,17 +80,20 @@
           this.xmlname = '开发商集体报建流程'
         } else if (this.selectdata.f_apply_type === '散户报建') {
           this.xmlname = '散户报建流程'
-        } else if (this.selectdata.f_apply_type === '工业户报建') {
-          this.xmlname = '工商户报建流程'
-        } else if (this.selectdata.f_apply_type === '商业户报建') {
+        }  else if (this.selectdata.f_apply_type === '工商户报建') {
           this.xmlname = '工商户报建流程'
         } else if (this.selectdata.f_apply_type === '散户集体报建') {
           this.xmlname = '散户集体报建流程'
         } else if (this.selectdata.f_apply_type === '煤改气报建') {
           this.xmlname = '散户集体报建流程'
+        } else if (this.selectdata.f_apply_type === '拆改装报建') {
+          this.xmlname = '拆改装流程'
         } else if (this.selectdata.f_apply_type === '综合报建') {
           this.xmlname = '报建流程'
-        } else {
+        }  else if (this.selectdata.f_apply_type === '居民报建') {
+          this.xmlname  = '居民报建流程'
+        }
+        else {
           this.$showMessage('暂无此类报装')
           return
         }