apply-clients 4.1.49-weinan → 4.1.51-weinan

package/package.json

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

package/src/components/app_apply/AppChargeManagement.vue

@@ -317,10 +317,29 @@ export default {
         }).then(res=>{
           console.log(res.data)
           if (res.data.code == '200'){
-            this.$showMessage('缴费成功！')
-            this.saveother()
-            this.showCharge=false
-            return
+            if (this.charge.f_payment_method == '现金缴费'){
+              let data1 = {
+                tablename: 't_userinfo',
+                condition: `f_userinfo_id = '${this.selectdata.f_userinfo_id}'`
+              }
+              http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data1}, {resolveMsg: null, rejectMsg: '获取数据失败'}).then(res1=>{
+                debugger
+                this.$showMessage( `确认对${res1.data[0].f_user_name}进行现金收费?`,['confirm', 'cancel']).then((res)=>{
+                  if (res=='confirm'){
+                    this.$showMessage('缴费成功！')
+                    this.saveother()
+                    this.showCharge=false
+                    return
+                  }
+                })
+              })
+            }else {
+              debugger
+              this.$showMessage('缴费成功！')
+              this.saveother()
+              this.showCharge=false
+              return
+            }
           }else {
             this.$showMessage('缴费失败')
             this.showCharge=false
@@ -536,7 +555,6 @@ export default {
         rejectMsg: null
       })
       if (res.data[0].f_user_id===null){
-        debugger
         this.$showMessage("请先添加表具信息！！！")
         return
       }

package/src/components/app_apply/AppProcessSupervisory.vue

@@ -1,251 +1,251 @@
-<template>
-  <div class="p-10">
-    <criteria-paged :model="model" v-ref:cp>
-      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
-        <div partial class="auto">
-          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
-            <label class="">报建编号：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=model.f_apply_num condition="u.f_apply_num like '%{}%'" />
-            </div>
-          </div>
-          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
-            <label class="">合同编号：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=model.f_contract_number condition="u.f_contract_number like '%{}%'" />
-            </div>
-          </div>
-          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
-            <label class="">报建类型：</label>
-            <div class="col-xs-8" >
-              <v-select
-                width="100%"
-                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>
-          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
-            <label class="">办理环节：</label>
-            <div class="col-xs-8" >
-              <v-select
-                width="100%"
-                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>
-          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
-            <label class="">开始时间：</label>
-            <div class="col-xs-8" >
-              <datepicker id="startDate" placeholder="开始日期"
-                          style="width: 100%!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>
-          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
-            <label class="">结束时间：</label>
-            <div class="col-xs-8" >
-              <datepicker id="endDate" placeholder="结束日期"
-                          style="width: 100%!important;"
-                          v-model="model.endDate"
-                          :value.sync="model.endDate"
-                          :format="'yyyy-MM-dd 23:59:59'"
-                          :show-reset-button="true"
-                          condition="f_apply_date <= '{}'">
-              </datepicker>
-            </div>
-          </div>
-          <div class="row form-group text-right" style="">
-            <button class="btn btn-primary" @click="$parent.$parent.search()">查询</button>
-            <button class="btn btn-info" @click="$parent.$parent.clear()">清空</button>
-            <button class="btn" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"></button>
-          </div>
-        </div>
-      </criteria>
-      <list :model="model" partial='list'>
-        <div partial class="auto app-text panel">
-          <div class="panel-body panel-self">
-            <div class="col-xs-12">
-              <p class="col-xs-3 text-left font"><b>工程编号：</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.f_apply_num }}</p>
-            </div>
-            <div class="col-xs-12">
-              <p class="col-xs-3 text-left font"><b>项目名称：</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.f_entry_name }}</p>
-            </div>
-            <div class="col-xs-12">
-              <p class="col-xs-3 text-left font"><b>报建类型：</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.f_apply_type }}</p>
-            </div>
-            <div class="col-xs-12">
-              <p class="col-xs-3 text-left font"><b>办理环节：</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.defname }}</p>
-            </div>
-            <div class="col-xs-12">
-              <p class="col-xs-3 text-left font"><b>用户类型:</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.f_user_type }}</p>
-            </div>
-              <div class="col-xs-12">
-                <p class="col-xs-3 text-left font"><b>流程状态：</b></p>
-                <p class="col-xs-9 text-left input-font">{{ row.f_sub_state }}</p>
-              </div>
-            <div class="col-xs-12">
-              <p class="col-xs-3 text-left font"><b>报建日期：</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.f_apply_date }}</p>
-            </div>
-
-
-            <div class="col-xs-12 text-right">
-              <button class="btn btn-info" @click="$parent.$parent.$parent.click(row)">查看</button>
-            </div>
-          </div>
-       </div>
-      </list>
-    </criteria-paged>
-  </div>
-</template>
-<script>
-  import Vue from 'vue'
-  import { PagedList, HttpResetClass } from 'vue-client'
-  import {isEmpty} from '../Util'
-  export default {
-    title: '报建流程',
-    data () {
-      return {
-        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/supervisory`, 20, {
-        // model: new PagedList('rs/sql/supervisory', 20, {
-          data: {
-            id: Vue.user.id,
-            orgid: Vue.user.orgid
-            // id: '35814',
-            // orgid: '10101'
-          }
-        }),
-        criteriaShow: false,
-    //    applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
-        applytype: [{label: '全部', value: ''},  ...this.$appdata.getParam('报建类型') || [] ], // 所有报建类型
-        defnames: [{label: '全部', value: ''}],
-        applyNatures: [{label: '全部', value: ''}] // 报建性质
-      }
-    },
-    ready () {
-      this.search()
-    },
-    methods: {
-      dialNumber (phone) {
-        this.$showMessage(`是否拨打电话：${phone}`, ['confirm']).then((res) => {
-          if (res === 'confirm') {
-            this.$androidUtil.makeAPhoneCall(phone)
-          }
-        })
-      },
-      clear () {
-        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-          this.$refs.cp.$refs.cri.model[key] = null
-        })
-      },
-      // 查询
-      search () {
-        this.$refs.cp.$refs.cri.search()
-      },
-      click (row) {
-        let _this = this
-        this.$dispatch('gotoson', {
-          _this: _this,
-          title: '详情信息',
-          safe: true
-        })
-        this.$goto('app-supervisory-cart', {selectdata: row}, 'self', _this.search)
-      },
-      applyTypeChange () {
-        if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
-          let http = new HttpResetClass()
-          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/getDefnameByType`, {
-            f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type
-          }, {resolveMsg: null, rejectMsg: null}).then((res) => {
-            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: ''}]
-        }
-      }
-    },
-    events: {
-    },
-    watch: {
-    }
-  }
-</script>
-<style scoped>
-  .panel-self{
-    border-radius: 10px;
-    border:1px solid #499EDF;
-    background-color: #F8F8F8;
-  }
-  .font{
-    font: 15px PingFang-SC-Medium;
-    color: #666666;
-  }
-
-  .button_shrink_top {
-    width: 34px;
-    height: 34px;
-    border: solid 1px #6aa6e2;
-    background-size: 100%;
-    background-image: url("../../../static/newStyle/stretch_top.png")
-  }
-
-  .button_shrink_bottom {
-    width: 34px;
-    height: 34px;
-    border: solid 1px #6aa6e2;
-    background-size: 100%;
-    background-image: url("../../../static/newStyle/stretch_bottom.png")
-  }
-</style>
-<style lang="less">
-.app-input {
-  label {
-    float: left;
-  }
-  .select {
-    button {
-      border: none;
-      outline: none;
-      text-align: left;
-      .btn-placeholder {
-        color: #ACA899
-      }
-    }
-  }
-  .datepicker {
-    .form-control:focus {
-      border: none!important;
-      outline: none!important;
-      -webkit-box-shadow: none;
-      box-shadow: none;
-    }
-  }
-}
-</style>
+<template>
+  <div class="p-10">
+    <criteria-paged :model="model" v-ref:cp>
+      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+        <div partial class="auto">
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">报建编号：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=model.f_apply_num condition="u.f_apply_num like '%{}%'" />
+            </div>
+          </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">合同编号：</label>
+            <div class="col-xs-8" >
+              <input class="" v-model=model.f_contract_number condition="u.f_contract_number like '%{}%'" />
+            </div>
+          </div>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">报建类型：</label>
+            <div class="col-xs-8" >
+              <v-select
+                width="100%"
+                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>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">办理环节：</label>
+            <div class="col-xs-8" >
+              <v-select
+                width="100%"
+                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>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">开始时间：</label>
+            <div class="col-xs-8" >
+              <datepicker id="startDate" placeholder="开始日期"
+                          style="width: 100%!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>
+          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
+            <label class="">结束时间：</label>
+            <div class="col-xs-8" >
+              <datepicker id="endDate" placeholder="结束日期"
+                          style="width: 100%!important;"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="true"
+                          condition="f_apply_date <= '{}'">
+              </datepicker>
+            </div>
+          </div>
+          <div class="row form-group text-right" style="">
+            <button class="btn btn-primary" @click="$parent.$parent.search()">查询</button>
+            <button class="btn btn-info" @click="$parent.$parent.clear()">清空</button>
+            <button class="btn" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}" @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"></button>
+          </div>
+        </div>
+      </criteria>
+      <list :model="model" partial='list'>
+        <div partial class="auto app-text panel">
+          <div class="panel-body panel-self">
+            <div class="col-xs-12">
+              <p class="col-xs-3 text-left font"><b>工程编号：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_apply_num }}</p>
+            </div>
+            <div class="col-xs-12">
+              <p class="col-xs-3 text-left font"><b>项目名称：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_entry_name }}</p>
+            </div>
+            <div class="col-xs-12">
+              <p class="col-xs-3 text-left font"><b>报建类型：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_apply_type }}</p>
+            </div>
+            <div class="col-xs-12">
+              <p class="col-xs-3 text-left font"><b>办理环节：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.defname }}</p>
+            </div>
+            <div class="col-xs-12">
+              <p class="col-xs-3 text-left font"><b>用户类型:</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_user_type }}</p>
+            </div>
+              <div class="col-xs-12">
+                <p class="col-xs-3 text-left font"><b>流程状态：</b></p>
+                <p class="col-xs-9 text-left input-font">{{ row.f_sub_state }}</p>
+              </div>
+            <div class="col-xs-12">
+              <p class="col-xs-3 text-left font"><b>报建日期：</b></p>
+              <p class="col-xs-9 text-left input-font">{{ row.f_apply_date }}</p>
+            </div>
+
+
+            <div class="col-xs-12 text-right">
+              <button class="btn btn-info" @click="$parent.$parent.$parent.click(row)">查看</button>
+            </div>
+          </div>
+       </div>
+      </list>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import { PagedList, HttpResetClass } from 'vue-client'
+  import {isEmpty} from '../Util'
+  export default {
+    title: '报建流程',
+    data () {
+      return {
+        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/supervisory`, 20, {
+        // model: new PagedList('rs/sql/supervisory', 20, {
+          data: {
+            id: Vue.user.id,
+            orgid: Vue.user.orgid
+            // id: '35814',
+            // orgid: '10101'
+          }
+        }),
+        criteriaShow: false,
+    //    applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')], // 所有报建类型
+        applytype: [{label: '全部', value: ''},  ...this.$appdata.getParam('报建类型') || [] ], // 所有报建类型
+        defnames: [{label: '全部', value: ''}],
+        applyNatures: [{label: '全部', value: ''}] // 报建性质
+      }
+    },
+    ready () {
+      this.search()
+    },
+    methods: {
+      dialNumber (phone) {
+        this.$showMessage(`是否拨打电话：${phone}`, ['confirm']).then((res) => {
+          if (res === 'confirm') {
+            this.$androidUtil.makeAPhoneCall(phone)
+          }
+        })
+      },
+      clear () {
+        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+          this.$refs.cp.$refs.cri.model[key] = null
+        })
+      },
+      // 查询
+      search () {
+        this.$refs.cp.$refs.cri.search()
+      },
+      click (row) {
+        let _this = this
+        this.$dispatch('gotoson', {
+          _this: _this,
+          title: '详情信息',
+          safe: true
+        })
+        this.$goto('app-supervisory-cart', {selectdata: row}, 'self', _this.search)
+      },
+      applyTypeChange () {
+        if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
+          let http = new HttpResetClass()
+          http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/getDefnameByType`, {
+            f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type
+          }, {resolveMsg: null, rejectMsg: null}).then((res) => {
+            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: ''}]
+        }
+      }
+    },
+    events: {
+    },
+    watch: {
+    }
+  }
+</script>
+<style scoped>
+  .panel-self{
+    border-radius: 10px;
+    border:1px solid #499EDF;
+    background-color: #F8F8F8;
+  }
+  .font{
+    font: 15px PingFang-SC-Medium;
+    color: #666666;
+  }
+
+  .button_shrink_top {
+    width: 34px;
+    height: 34px;
+    border: solid 1px #6aa6e2;
+    background-size: 100%;
+    background-image: url("../../../static/newStyle/stretch_top.png")
+  }
+
+  .button_shrink_bottom {
+    width: 34px;
+    height: 34px;
+    border: solid 1px #6aa6e2;
+    background-size: 100%;
+    background-image: url("../../../static/newStyle/stretch_bottom.png")
+  }
+</style>
+<style lang="less">
+.app-input {
+  label {
+    float: left;
+  }
+  .select {
+    button {
+      border: none;
+      outline: none;
+      text-align: left;
+      .btn-placeholder {
+        color: #ACA899
+      }
+    }
+  }
+  .datepicker {
+    .form-control:focus {
+      border: none!important;
+      outline: none!important;
+      -webkit-box-shadow: none;
+      box-shadow: none;
+    }
+  }
+}
+</style>

package/src/components/app_apply/AppSupervisoryCart.vue

@@ -1,119 +1,119 @@
-<template>
-  <div style="padding: 10px">
-    <div partial class="auto app-text panel" style="margin-bottom: 20px">
-      <div class="panel-body panel-self">
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>工程编号：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_num }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>项目名称：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_entry_name }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>报建类型：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_type }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>办理环节：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.defname }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>用户类型:</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_user_type }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>流程状态：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_sub_state }}</p>
-        </div>
-        <div class="col-xs-12">
-          <p class="col-xs-3 text-left font"><b>报建日期：</b></p>
-          <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_date }}</p>
-        </div>
-      </div>
-    </div>
-    <div class="row" v-for="(i,row) in defnames">
-        <div :class="row.id === selectdata.actid ? 'item selectIndex' : 'item'" @click="shouju(row)">
-          {{row.defname}}
-          <span v-if="row.state === '结束'">({{ row.person }})</span>
-          <span v-if="row.state !== '结束' && row.actorexpression !== null && row.actorexpression.indexOf('PI') === 0">
-            ({{ row.peruser }})
-          </span>
-          <br>
-          {{ row.finishtime ? row.finishtime : row.sendtime }}<br>
-        </div>
-        <div class="arrow glyphicon glyphicon-menu-down" v-if="i != defnames.length-1" aria-hidden="true"></div>
-    </div>
-  </div>
-</template>
-
-<script>
-import {HttpResetClass} from 'vue-client'
-export default {
-  title: '流程节点',
-  props: ['selectdata'],
-  data () {
-    return {
-      defnames: [],
-      flag:false
-    }
-  },
-  ready () {
-    this.initial()
-  },
-  methods: {
-    async shouju(row){
-      console.log("进入方法:",this.selectdata)
-    },
-    async initial() {
-      // 获取流程节点信息
-      let http = new HttpResetClass()
-      let data = {
-        processid: this.selectdata.f_process_id
-      }
-      let res = await http.load(
-        'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/sql/getAllNode`,
-        // `rs/sql/getAllNode`,
-        {data: data},
-        {
-          resolveMsg:null,
-          rejectMsg:null
-        })
-      this.defnames = res.data
-    },
-  },
-  watch: {
-  }
-}
-</script>
-
-<style scoped>
-.app-text {
-  font-size: 12px;
-}
-.panel-self{
-  border-radius: 10px;
-  border:1px solid #499EDF;
-  background-color: #F8F8F8;
-}
-.row{
-  padding: 0 40px;
-  text-align: center;
-  height: auto;
-}
-.item{
-  border-radius: 2em;
-  border: 1px solid silver;
-  line-height: 25px;
-}
-.arrow{
-  width: 100%;
-  color: #5ac0d9;
-  font-weight: bold;
-}
-.selectIndex{
-  background-color: #5ac0d9;
-  color: #ffffff;
-}
-</style>
+<template>
+  <div style="padding: 10px">
+    <div partial class="auto app-text panel" style="margin-bottom: 20px">
+      <div class="panel-body panel-self">
+        <div class="col-xs-12">
+          <p class="col-xs-3 text-left font"><b>工程编号：</b></p>
+          <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_num }}</p>
+        </div>
+        <div class="col-xs-12">
+          <p class="col-xs-3 text-left font"><b>项目名称：</b></p>
+          <p class="col-xs-9 text-left input-font">{{ selectdata.f_entry_name }}</p>
+        </div>
+        <div class="col-xs-12">
+          <p class="col-xs-3 text-left font"><b>报建类型：</b></p>
+          <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_type }}</p>
+        </div>
+        <div class="col-xs-12">
+          <p class="col-xs-3 text-left font"><b>办理环节：</b></p>
+          <p class="col-xs-9 text-left input-font">{{ selectdata.defname }}</p>
+        </div>
+        <div class="col-xs-12">
+          <p class="col-xs-3 text-left font"><b>用户类型:</b></p>
+          <p class="col-xs-9 text-left input-font">{{ selectdata.f_user_type }}</p>
+        </div>
+        <div class="col-xs-12">
+          <p class="col-xs-3 text-left font"><b>流程状态：</b></p>
+          <p class="col-xs-9 text-left input-font">{{ selectdata.f_sub_state }}</p>
+        </div>
+        <div class="col-xs-12">
+          <p class="col-xs-3 text-left font"><b>报建日期：</b></p>
+          <p class="col-xs-9 text-left input-font">{{ selectdata.f_apply_date }}</p>
+        </div>
+      </div>
+    </div>
+    <div class="row" v-for="(i,row) in defnames">
+        <div :class="row.id === selectdata.actid ? 'item selectIndex' : 'item'" @click="shouju(row)">
+          {{row.defname}}
+          <span v-if="row.state === '结束'">({{ row.person }})</span>
+          <span v-if="row.state !== '结束' && row.actorexpression !== null && row.actorexpression.indexOf('PI') === 0">
+            ({{ row.peruser }})
+          </span>
+          <br>
+          {{ row.finishtime ? row.finishtime : row.sendtime }}<br>
+        </div>
+        <div class="arrow glyphicon glyphicon-menu-down" v-if="i != defnames.length-1" aria-hidden="true"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+export default {
+  title: '流程节点',
+  props: ['selectdata'],
+  data () {
+    return {
+      defnames: [],
+      flag:false
+    }
+  },
+  ready () {
+    this.initial()
+  },
+  methods: {
+    async shouju(row){
+      console.log("进入方法:",this.selectdata)
+    },
+    async initial() {
+      // 获取流程节点信息
+      let http = new HttpResetClass()
+      let data = {
+        processid: this.selectdata.f_process_id
+      }
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/getAllNode`,
+        // `rs/sql/getAllNode`,
+        {data: data},
+        {
+          resolveMsg:null,
+          rejectMsg:null
+        })
+      this.defnames = res.data
+    },
+  },
+  watch: {
+  }
+}
+</script>
+
+<style scoped>
+.app-text {
+  font-size: 12px;
+}
+.panel-self{
+  border-radius: 10px;
+  border:1px solid #499EDF;
+  background-color: #F8F8F8;
+}
+.row{
+  padding: 0 40px;
+  text-align: center;
+  height: auto;
+}
+.item{
+  border-radius: 2em;
+  border: 1px solid silver;
+  line-height: 25px;
+}
+.arrow{
+  width: 100%;
+  color: #5ac0d9;
+  font-weight: bold;
+}
+.selectIndex{
+  background-color: #5ac0d9;
+  color: #ffffff;
+}
+</style>

package/src/components/app_apply/materialshoufei.vue

@@ -1,239 +1,239 @@
-<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>序号</th>
-          <th>材料名称</th>
-          <th>单价(元)</th>
-          <th>数量</th>
-          <th>金额</th>
-          <th>备注</th>
-          <th v-if="$parent.$parent.mark === 0">
-            <button type="button" class="btn btn-info head-but" @click="$parent.$parent.addshoufei()" >新增收费
-            </button>
-          </th>
-        </tr>
-      </template>
-      <template partial='body'>
-        <td style="text-align: center">{{ $index + 1}}</td>
-        <td style="text-align: center">{{ row.f_material_name}}</td>
-        <td style="text-align: center">{{ row.f_material_price}}</td>
-        <td style="text-align: center">{{ row.f_material_number}}</td>
-        <td style="text-align: center">{{ row.f_fee}}</td>
-        <td style="text-align: center">{{ row.f_remarks}}</td>
-        <td class="flex-around" v-if="$parent.$parent.mark === 0">
-          <button type="button" name="button" class="btn btn-link"
-                  @click.stop="$parent.$parent.modifyParam(row)">修改
-          </button>
-          <button type="button" name="button" class="btn btn-link"
-                  @click.stop="$parent.$parent.deleteItem(row)">删除
-          </button>
-        </td>
-      </template>
-    </data-grid>
-    <span>合计：{{ f_cost_sum }}元</span>
-  </div>
-
-  <modal :show.sync="showpay" v-ref:modal backdrop="false">
-    <header slot="modal-header" class="modal-header">
-      <button type="button" class="close" @click="close"><span>&times;</span></button>
-      <h4 class="modal-title">新增材料收费</h4>
-    </header>
-    <article slot="modal-body" class="modal-body">
-      <div class="from-group">
-        <label>材料名称</label>
-        <input-select
-          class="select select_list"
-          :value.sync="addItem.f_material_name"
-           v-model="addItem.f_material_name"
-          :options="positions"
-          @change="setTypename"
-          :valueSingle="true"></input-select>
-      </div>
-      <div class="from-group">
-        <label>品名规格</label>
-        <input-select
-          class="select select_list"
-          :value.sync="addItem.f_typename"
-          v-model="addItem.f_typename"
-          :options="typeNameList"
-          @change="setTypenumber"
-          :valueSingle="true"></input-select>
-      </div>
-      <div class="from-group">
-        <label>型号</label>
-        <input-select
-          class="select select_list"
-          :value.sync="addItem.f_typenumber"
-          v-model="addItem.f_typenumber"
-          :options="typeNumberList"
-          @change="setmaterialprice"
-          :valueSingle="true"></input-select>
-      </div>
-      <div class="from-group">
-        <label>单价(元)</label>
-        <input type="number" class="form-control" v-model="addItem.f_material_price" readonly>
-      </div>
-      <div class="from-group">
-        <label>数量</label>
-        <input type="number" class="form-control" v-model="addItem.f_material_number" >
-      </div>
-      <div class="from-group">
-        <label>金额</label>
-        <input type="number" class="form-control" v-model="addItem.f_fee" :value="smalltoBIG()" readonly>
-      </div>
-      <div class="from-group">
-        <label>备注</label>
-        <textarea type="text" rows="2" class="form-control" v-model="addItem.f_remarks"></textarea>
-      </div>
-    </article>
-    <footer slot="modal-footer" class="modal-footer">
-      <button v-show="showpay" type="button" class="btn btn-default" @click='close'>取消</button>
-      <button v-show="showpay" type="button" class="btn btn-success" @click='addpaydipetail' :disabled="!$v.valid">确认</button>
-    </footer>
-  </modal>
-</template>
-
-<script>
-import {HttpResetClass} from 'vue-client'
-import Vue from "vue";
-import $ from 'jquery'
-
-export default {
-  title: '材料收费',
-  data() {
-    return {
-      showpay: false, // 新增材料收费开关
-      model: {
-        rows: [] // 材料收费数据数组
-      },
-      addItem: {
-        f_material_price:0
-      },
-      f_cost_sum: 0,
-      positions:this.$appdata.getParam('品名及规格'),
-      typeNameList:null,
-      typeNumberList:null
-    }
-  },
-  props: {
-    selectdata: {
-      type: Object
-    },
-    mark: {
-      type: Number,
-      default: 0
-    }
-  },
-  ready() {
-    this.load()
-  },
-  methods: {
-    async load() {
-      let http = new HttpResetClass()
-      let data = {
-        tablename: 't_material_charges',
-        condition: `f_process_id = '${this.selectdata.f_process_id}'`
-      }
-      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data}, {resolveMsg: null, rejectMsg: '获取数据失败'})
-        .then((res) => {
-          this.model.rows = res.data
-          this.f_cost_sum = 0
-          for (var i = 0; i < this.model.rows.length; i++) {
-            this.f_cost_sum += Number(this.model.rows[i].f_fee)
-          }
-          this.$set('selectdata.f_cost_sum',this.f_cost_sum)
-        })
-    },
-    // 关闭模态框
-    close() {
-      this.showpay = false
-      this.addItem =  {
-        f_material_price:0
-      }
-    },
-    // 模态框确定按钮保存数据
-    async addpaydipetail() {
-      let http = new HttpResetClass()
-      this.addItem.f_process_id = this.selectdata.f_process_id
-      this.addItem.f_apply_num = this.selectdata.f_apply_num
-      this.addItem.f_operator = Vue.user.name
-      this.addItem.f_department = Vue.user.f_department_name
-      this.addItem.f_filiale = Vue.user.orgs
-      await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/addmaterialshoufei`, this.addItem, {resolveMsg: '保存成功', rejectMsg: '保存失败'})
-        .then((res) => {
-          this.close()
-          this.load()
-        })
-    },
-    deleteItem(row) {
-      let http = new HttpResetClass()
-      http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/delectmaterialshoufei`, {data: row}, {resolveMsg: null, rejectMsg: '删除失败'})
-        .then((res) => {
-          this.load()
-        })
-    },
-    //新增收费 开启模态框
-    addshoufei() {
-      this.showpay = true
-    },
-    modifyParam(row) {
-      this.addItem = row
-      this.showpay = true
-    },
-    // 金额计算
-    smalltoBIG() {
-      let num =  Number(this.addItem.f_material_price) *  Number(this.addItem.f_material_number)
-      return num
-    },
-     setTypename (val) {
-      this.typeNameList = this.$appdata.getParam(val)
-    },
-    setTypenumber (val) {
-      this.typeNumberList = this.$appdata.getParam(val)
-    },
-    setmaterialprice(val){
-      if(val==null){
-        this.addItem.f_material_price = 0
-      }
-      this.addItem.f_material_price = this.$appdata.getSingleValue(val)
-    }
-  },
-  watch: {
-    'typeNumberList'(){
-     this.addItem.f_typenumber=null
-     this.addItem.f_material_price = 0
-     },
-    'typeNameList'() {
-      this.addItem.f_typename = null
-      this.addItem.f_typenumber = null
-      this.addItem.f_material_price = 0
-    }
-  }
-}
-
-</script>
-
-
-<style scoped>
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-  width: 100%;
-}
-
-table, td, th {
-  padding: 0;
-  border: 1px solid black
-}
-
-tr {
-  height: 34px;
-}
-
-#DynamicForm input {
-  text-align: center;
-}
-
-</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>序号</th>
+          <th>材料名称</th>
+          <th>单价(元)</th>
+          <th>数量</th>
+          <th>金额</th>
+          <th>备注</th>
+          <th v-if="$parent.$parent.mark === 0">
+            <button type="button" class="btn btn-info head-but" @click="$parent.$parent.addshoufei()" >新增收费
+            </button>
+          </th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <td style="text-align: center">{{ $index + 1}}</td>
+        <td style="text-align: center">{{ row.f_material_name}}</td>
+        <td style="text-align: center">{{ row.f_material_price}}</td>
+        <td style="text-align: center">{{ row.f_material_number}}</td>
+        <td style="text-align: center">{{ row.f_fee}}</td>
+        <td style="text-align: center">{{ row.f_remarks}}</td>
+        <td class="flex-around" v-if="$parent.$parent.mark === 0">
+          <button type="button" name="button" class="btn btn-link"
+                  @click.stop="$parent.$parent.modifyParam(row)">修改
+          </button>
+          <button type="button" name="button" class="btn btn-link"
+                  @click.stop="$parent.$parent.deleteItem(row)">删除
+          </button>
+        </td>
+      </template>
+    </data-grid>
+    <span>合计：{{ f_cost_sum }}元</span>
+  </div>
+
+  <modal :show.sync="showpay" v-ref:modal backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="close"><span>&times;</span></button>
+      <h4 class="modal-title">新增材料收费</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="from-group">
+        <label>材料名称</label>
+        <input-select
+          class="select select_list"
+          :value.sync="addItem.f_material_name"
+           v-model="addItem.f_material_name"
+          :options="positions"
+          @change="setTypename"
+          :valueSingle="true"></input-select>
+      </div>
+      <div class="from-group">
+        <label>品名规格</label>
+        <input-select
+          class="select select_list"
+          :value.sync="addItem.f_typename"
+          v-model="addItem.f_typename"
+          :options="typeNameList"
+          @change="setTypenumber"
+          :valueSingle="true"></input-select>
+      </div>
+      <div class="from-group">
+        <label>型号</label>
+        <input-select
+          class="select select_list"
+          :value.sync="addItem.f_typenumber"
+          v-model="addItem.f_typenumber"
+          :options="typeNumberList"
+          @change="setmaterialprice"
+          :valueSingle="true"></input-select>
+      </div>
+      <div class="from-group">
+        <label>单价(元)</label>
+        <input type="number" class="form-control" v-model="addItem.f_material_price" readonly>
+      </div>
+      <div class="from-group">
+        <label>数量</label>
+        <input type="number" class="form-control" v-model="addItem.f_material_number" >
+      </div>
+      <div class="from-group">
+        <label>金额</label>
+        <input type="number" class="form-control" v-model="addItem.f_fee" :value="smalltoBIG()" readonly>
+      </div>
+      <div class="from-group">
+        <label>备注</label>
+        <textarea type="text" rows="2" class="form-control" v-model="addItem.f_remarks"></textarea>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button v-show="showpay" type="button" class="btn btn-default" @click='close'>取消</button>
+      <button v-show="showpay" type="button" class="btn btn-success" @click='addpaydipetail' :disabled="!$v.valid">确认</button>
+    </footer>
+  </modal>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import Vue from "vue";
+import $ from 'jquery'
+
+export default {
+  title: '材料收费',
+  data() {
+    return {
+      showpay: false, // 新增材料收费开关
+      model: {
+        rows: [] // 材料收费数据数组
+      },
+      addItem: {
+        f_material_price:0
+      },
+      f_cost_sum: 0,
+      positions:this.$appdata.getParam('品名及规格'),
+      typeNameList:null,
+      typeNumberList:null
+    }
+  },
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  ready() {
+    this.load()
+  },
+  methods: {
+    async load() {
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_material_charges',
+        condition: `f_process_id = '${this.selectdata.f_process_id}'`
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data}, {resolveMsg: null, rejectMsg: '获取数据失败'})
+        .then((res) => {
+          this.model.rows = res.data
+          this.f_cost_sum = 0
+          for (var i = 0; i < this.model.rows.length; i++) {
+            this.f_cost_sum += Number(this.model.rows[i].f_fee)
+          }
+          this.$set('selectdata.f_cost_sum',this.f_cost_sum)
+        })
+    },
+    // 关闭模态框
+    close() {
+      this.showpay = false
+      this.addItem =  {
+        f_material_price:0
+      }
+    },
+    // 模态框确定按钮保存数据
+    async addpaydipetail() {
+      let http = new HttpResetClass()
+      this.addItem.f_process_id = this.selectdata.f_process_id
+      this.addItem.f_apply_num = this.selectdata.f_apply_num
+      this.addItem.f_operator = Vue.user.name
+      this.addItem.f_department = Vue.user.f_department_name
+      this.addItem.f_filiale = Vue.user.orgs
+      await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/addmaterialshoufei`, this.addItem, {resolveMsg: '保存成功', rejectMsg: '保存失败'})
+        .then((res) => {
+          this.close()
+          this.load()
+        })
+    },
+    deleteItem(row) {
+      let http = new HttpResetClass()
+      http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/delectmaterialshoufei`, {data: row}, {resolveMsg: null, rejectMsg: '删除失败'})
+        .then((res) => {
+          this.load()
+        })
+    },
+    //新增收费 开启模态框
+    addshoufei() {
+      this.showpay = true
+    },
+    modifyParam(row) {
+      this.addItem = row
+      this.showpay = true
+    },
+    // 金额计算
+    smalltoBIG() {
+      let num =  Number(this.addItem.f_material_price) *  Number(this.addItem.f_material_number)
+      return num
+    },
+     setTypename (val) {
+      this.typeNameList = this.$appdata.getParam(val)
+    },
+    setTypenumber (val) {
+      this.typeNumberList = this.$appdata.getParam(val)
+    },
+    setmaterialprice(val){
+      if(val==null){
+        this.addItem.f_material_price = 0
+      }
+      this.addItem.f_material_price = this.$appdata.getSingleValue(val)
+    }
+  },
+  watch: {
+    'typeNumberList'(){
+     this.addItem.f_typenumber=null
+     this.addItem.f_material_price = 0
+     },
+    'typeNameList'() {
+      this.addItem.f_typename = null
+      this.addItem.f_typenumber = null
+      this.addItem.f_material_price = 0
+    }
+  }
+}
+
+</script>
+
+
+<style scoped>
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+  width: 100%;
+}
+
+table, td, th {
+  padding: 0;
+  border: 1px solid black
+}
+
+tr {
+  height: 34px;
+}
+
+#DynamicForm input {
+  text-align: center;
+}
+
+</style>

package/src/components/product/Process/Service/ServiceControl.vue

@@ -786,6 +786,21 @@ export default {
         this.$showAlert(e, 'warning', 3000)
         return
       }
+      if (model.f_entry_name){
+        let http = new HttpResetClass()
+        let data = {
+          tablename:'t_apply',
+          condition:`f_entry_name = '${model.f_entry_name}'`
+        }
+        let res = await http.load('post','rs/sql/singleTable', {data:data},{
+          resolveMsg: null,
+          rejectMsg: '查询失败'})
+        debugger
+        if (res.data.length > 0){
+          this.$showMessage('项目名称不能重复，请重新输入！！！')
+          return
+        }
+      }
       let http = new HttpResetClass()
       if((this.selectdata.defname =='现场勘察' || this.selectdata.defname ==='入户安装') && model.f_is_have == '否'&& model.button.button_name == '提交'){
         let model1 ={