apply-clients 6.0.1 → 6.0.4

package/src/components/build/Install/Process/zhongran/ZR_CustomerEssentialInfo.vue

@@ -311,7 +311,7 @@
           this.$showMessage("请选择报装类型！")
           return false
         } else {
-          this.model.f_apply_type = this.model.f_apply_type + "流程"
+          this.model.f_apply_type = this.model.f_apply_type
           let fileInfoData = this.$parent.$parent.$parent.$parent.$refs.file.fileInfoData
           let recordmessage = this.$parent.$parent.$parent.$parent.$refs.record.model.rows
           let materialmessage = this.$parent.$parent.$parent.$parent.$refs.material.model.rows

package/src/components/build/Install/Process/zhongran/ZR_MaterialPlan.vue

@@ -1,259 +1,259 @@
-<template>
-  <div class="auto select-overspread">
-    <div class="panel panel-info">
-      <div class="panel-heading">
-        <h3 class="panel-title">材料计划</h3>
-      </div>
-    </div>
-    <validator name="v">
-    <form class="form-horizontal">
-      <div class="col-sm-11 form-group">
-        <div class="form-group col-sm-4">
-          <div class="col-sm-3"></div>
-          <div class="col-sm-6">
-            <input type="checkbox" class="" id="checkbox" v-model="model.f_ismaterial_complete" :readonly="edit ? false : 'readonly'">
-            <label for="checkbox" class="font-size">材料是否齐全</label>
-          </div>
-        </div>
-      </div>
-      <div class="form-group col-sm-11">
-        <label class="col-sm-2" for="f_material_remarks">材料备注：</label>
-        <div class="col-sm-10" id="f_material_remarks">
-          <textarea class="form-control" v-model="model.f_material_remarks" rows="3"
-                    :readonly="edit ? false : 'readonly'">
-          </textarea>
-        </div>
-      </div>
-      <div class="form-group col-sm-11" v-if="showreason">
-        <label class="col-sm-2" for="f_material_remarks">申请不通过原因：</label>
-        <div class="col-sm-10">
-          <textarea class="form-control" v-model="model.f_back_reason" rows="3"  readonly>
-          </textarea>
-        </div>
-      </div>
-    </form>
-    </validator>
-    <div class="from-group col-sm-11" v-show="edit">
-      <center>
-        <button type="button" @click="confirm()" class="btn btn-primary" style="width:80px; margin-left:40px;">
-          保存
-        </button>
-        <button type="button" @click="commit()" class="btn btn-primary" style="width:80px; margin-left:40px;">
-         {{buttonName}}
-        </button>
-        <button type="button" @click="reset()" class="btn btn-warning" style="width:80px; margin-left:40px;">
-          取消
-        </button>
-        <button type="button" @click="back()" class="btn btn-warning" style="width:80px; margin-left:50px;">
-          退回
-        </button>
-      </center>
-    </div>
-  </div>
-</template>
-<script>
-  import co from 'co'
-  import  {HttpResetClass} from 'vue-client'
-  import * as Util from '../../../../Util'
-  let gen = function* (self, val) {
-    val.f_survey_name = self.employeetemplate
-    val.f_temp_date = Util.toStandardTimeString()
-    val.f_sub_state = '正常'
-    /*val.f_gas_type = val.f_gas_type[0] ? val.f_gas_type[0] : ''
-    val.f_gas_type = val.f_survey_name[0] ? val.f_survey_name[0] : ''*/
-    let data ={
-      tablename:'t_apply',
-      parameters:val
-    }
-    yield self.$resetpost('rs/logic/save', {data:data})
-    data = {
-      model: {
-        f_processid: self.selectdata.f_process_id,
-      },
-      loginUser: {
-        id: self.$login.f.id,
-        name: self.$login.f.name,
-        ename: self.$login.f.ename
-      },
-      employeetemplate: self.employeetemplate,// 指派勘察人员
-      subdep: self.buttonName
-    }
-    console.log(">>>>>>>>>>>>11>>>>>>>>>>",data.model.f_processid)
-    self.$resetpost(`rs/logic/grantnext`,
-      {data: data})
-      .then(() => {
-        self.reset()
-      })
-  }
-  export default {
-    title: '材料计划',
-    data() {
-      return {
-        employees: [],  // 部门人员数组
-        employeetemplate: '', // 选定部门人员
-        model: {
-        },
-        buttonName:'',
-        showsub:false,
-        showreason:false
-      }
-    },
-    props: ['selectdata','edit'],
-    ready() {
-
-      this.model = Object.assign({}, this.model, this.selectdata)
-      if( this.selectdata.f_sub_state == '申请打回'){
-          this.showreason = true
-      }
-    },
-    methods: {
-      // 退回则默认值为已存储的人
-      toemployees() {
-        if (this.temploader == '技术组长' && this.model.f_survey_name) {
-          this.employeetemplate = this.model.f_survey_name
-        }
-      },
-      // 获取部门领导角色
-      async loademployees() {
-        let http = new HttpResetClass()
-        if (this.selectdata.actdefid != '1') {
-          await http.load('POST','rs/sql/singleTable', {
-            data: {
-              tablename: 't_actorperson',
-              condition: " userseq='" + this.$login.f.id + "' order by id desc"
-            }
-          }, {resolveMsg: null, rejectMsg: "角色人员是(登陆人)信息查询失败"}, {silent: true})
-            .then((res) => {
-              console.log("取得部门领导的角色" + res.data[0].actorid)
-              if (res.data[0].actorid.startsWith("R") && (res.data[0].actorid.includes("部门负责人") || res.data[0].actorid.includes("部经理")|| res.data[0].actorid.includes("部门领导") || res.data[0].actorid.includes("部负责人") || res.data[0].actorid.includes("部领导")||res.data[0].actorid.includes("组长"))) {
-                let loaderstr = res.data[0].actorid.substring(2, res.data[0].actorid.length - 1)
-                this.temploader = loaderstr
-                // 如果是退回的就用已经保存的人员，保证下发的是同一个人
-                this.toemployees()
-                let loademployeestr = null
-                if (loaderstr.includes("部门")) {
-                  loademployeestr = 'R(' + loaderstr.split("部门")[0] + '部门人员)'
-                } else if (loaderstr.includes("部")) {
-                  loademployeestr = 'R(' + loaderstr.split("部")[0] + '部人员)'
-                } else if (loaderstr.includes("组长")) {
-                  loademployeestr = 'R(' + loaderstr.split("组长")[0] + '人员)'
-                }
-                console.log(loademployeestr)
-                let http2 = new HttpResetClass()
-                http2.load('POST','rs/sql/singleTable', {
-                  data: {
-                    tablename: 't_role',
-                    condition: " name='" + loademployeestr.substring(2, loademployeestr.length - 1) + "'"
-                    // condition: " name='" + loaderstr.split("部")[0] + '部人员' + "'"
-                  }
-                }, {resolveMsg: null, rejectMsg: "角色人员(部门人员)id信息查询失败"}, {silent: true}).then((res) => {
-                  console.log("取得角色人员(部门人员)id" + JSON.stringify(res.data[0].id))
-                  let strid = res.data[0].id
-                  let http3 = new HttpResetClass()
-                  http3.load('POST','rs/sql/singleTable', {
-                    data: {
-                      tablename: 't_user',
-                      condition: "roles  like '%" + strid + "%'"
-                    }
-                  }, {resolveMsg: null, rejectMsg: "角色人员(部门人员)信息查询失败"}, {silent: true}).then((res) => {
-                    console.log("角色人员(部门人员)信息成功")
-                    for (var i = 0; i < res.data.length; i++) {
-                      this.employees.push({lable: res.data[i].name, value: res.data[i].name})
-                    }
-                  })
-                })
-              }
-            })
-        }
-      },
-      confirm() {
-        //判断当前节点的状态（开始活动/完工）
-        this.$resetpost('rs/sql/findProcessState', {data: {actid:this.selectdata.actid}}, {
-          resolveMsg: null,
-          rejectMsg: '提交错误！'
-        }).then((res) => {
-          console.log(">>>>>>>>>节点状态查询结果<<<<<<<<<<<", res)
-          if (res.data[0].state != '开始活动') {
-            this.$showMessage("该节点信息已在别处提交，请刷新！")
-            this.reset()
-          } else {
-              let data ={
-                tablename:'t_apply',
-                parameters:this.model
-              }
-              this.$resetpost('rs/logic/save',{data:data} )
-                .then(() => {
-                  this.reset()
-                })
-          }
-        })
-
-      },
-      commit() {
-        //判断当前节点的状态（开始活动/完工）
-        this.$resetpost('rs/sql/findProcessState', {data: {actid:this.selectdata.actid}}, {
-          resolveMsg: null,
-          rejectMsg: '提交错误！'
-        }).then((res) => {
-          console.log(">>>>>>>>>节点状态查询结果<<<<<<<<<<<", res)
-          if (res.data[0].state != '开始活动') {
-            this.$showMessage("该节点信息已在别处提交，请刷新！")
-            this.reset()
-          } else {
-            let getGen = gen(this, this.model)
-            co(getGen)
-          }
-        })
-      },
-      //退回上一个流程
-      back() {
-        // this.model.f_sub_state = '退回'
-        this.confirm()
-        let data = {
-          model: {
-            f_processid: this.selectdata.f_process_id,
-          },
-          loginUser: {
-            id: this.$login.f.id,
-            name: this.$login.f.name,
-            ename: this.$login.f.ename
-          },
-          subdep: '退回'
-        }
-        let http = new HttpResetClass()
-        http.load('POST',`rs/logic/ignitionnext`,
-          {data: data})
-          .then(() => {
-            this.reset()
-          })
-      },
-
-      //数据校验
-      verification() {
-
-      },
-      reset() {
-        this.$dispatch('close')
-        this.$dispatch('selfsearch')
-      },
-      setselect() {
-        this.selectdata.f_gas_type = this.selectdata.f_gas_type ? this.selectdata.f_gas_type : this.model.f_gas_type
-        this.selectdata.f_survey_name = this.selectdata.f_survey_name ? this.selectdata.f_survey_name : this.model.f_survey_name
-        this.model = Object.assign({}, this.model, this.selectdata)
-        this.model.f_survey_date = this.$login.toStandardDateString()
-        this.model.f_survey_department = this.$login.f.f_parentname
-        this.model.f_survey_operator = this.$login.f.name
-      }
-    },
-    watch: {
-      'model.f_ismaterial_complete'(val){
-
-        if(val === true){
-          this.buttonName = '提交'
-        }else{
-          this.buttonName = '申请材料'
-        }
-      }
-    }
-  }
-</script>
+<template>
+  <div class="auto select-overspread">
+    <div class="panel panel-info">
+      <div class="panel-heading">
+        <h3 class="panel-title">材料计划</h3>
+      </div>
+    </div>
+    <validator name="v">
+    <form class="form-horizontal">
+      <div class="col-sm-11 form-group">
+        <div class="form-group col-sm-4">
+          <div class="col-sm-3"></div>
+          <div class="col-sm-6">
+            <input type="checkbox" class="" id="checkbox" v-model="model.f_ismaterial_complete" :readonly="edit ? false : 'readonly'">
+            <label for="checkbox" class="font-size">材料是否齐全</label>
+          </div>
+        </div>
+      </div>
+      <div class="form-group col-sm-11">
+        <label class="col-sm-2" for="f_material_remarks">材料备注：</label>
+        <div class="col-sm-10" id="f_material_remarks">
+          <textarea class="form-control" v-model="model.f_material_remarks" rows="3"
+                    :readonly="edit ? false : 'readonly'">
+          </textarea>
+        </div>
+      </div>
+      <div class="form-group col-sm-11" v-if="showreason">
+        <label class="col-sm-2" for="f_material_remarks">申请不通过原因：</label>
+        <div class="col-sm-10">
+          <textarea class="form-control" v-model="model.f_back_reason" rows="3"  readonly>
+          </textarea>
+        </div>
+      </div>
+    </form>
+    </validator>
+    <div class="from-group col-sm-11" v-show="edit">
+      <center>
+        <button type="button" @click="confirm()" class="btn btn-primary" style="width:80px; margin-left:40px;">
+          保存
+        </button>
+        <button type="button" @click="commit()" class="btn btn-primary" style="width:80px; margin-left:40px;">
+         {{buttonName}}
+        </button>
+        <button type="button" @click="reset()" class="btn btn-warning" style="width:80px; margin-left:40px;">
+          取消
+        </button>
+        <button type="button" @click="back()" class="btn btn-warning" style="width:80px; margin-left:50px;">
+          退回
+        </button>
+      </center>
+    </div>
+  </div>
+</template>
+<script>
+  import co from 'co'
+  import  {HttpResetClass} from 'vue-client'
+  import * as Util from '../../../../Util'
+  let gen = function* (self, val) {
+    val.f_survey_name = self.employeetemplate
+    val.f_temp_date = Util.toStandardTimeString()
+    val.f_sub_state = '正常'
+    /*val.f_gas_type = val.f_gas_type[0] ? val.f_gas_type[0] : ''
+    val.f_gas_type = val.f_survey_name[0] ? val.f_survey_name[0] : ''*/
+    let data ={
+      tablename:'t_apply',
+      parameters:val
+    }
+    yield self.$resetpost('rs/logic/save', {data:data})
+    data = {
+      model: {
+        f_processid: self.selectdata.f_process_id,
+      },
+      loginUser: {
+        id: self.$login.f.id,
+        name: self.$login.f.name,
+        ename: self.$login.f.ename
+      },
+      employeetemplate: self.employeetemplate,// 指派勘察人员
+      subdep: self.buttonName
+    }
+    console.log(">>>>>>>>>>>>11>>>>>>>>>>",data.model.f_processid)
+    self.$resetpost(`rs/logic/grantnext`,
+      {data: data})
+      .then(() => {
+        self.reset()
+      })
+  }
+  export default {
+    title: '材料计划',
+    data() {
+      return {
+        employees: [],  // 部门人员数组
+        employeetemplate: '', // 选定部门人员
+        model: {
+        },
+        buttonName:'',
+        showsub:false,
+        showreason:false
+      }
+    },
+    props: ['selectdata','edit'],
+    ready() {
+
+      this.model = Object.assign({}, this.model, this.selectdata)
+      if( this.selectdata.f_sub_state == '申请打回'){
+          this.showreason = true
+      }
+    },
+    methods: {
+      // 退回则默认值为已存储的人
+      toemployees() {
+        if (this.temploader == '技术组长' && this.model.f_survey_name) {
+          this.employeetemplate = this.model.f_survey_name
+        }
+      },
+      // 获取部门领导角色
+      async loademployees() {
+        let http = new HttpResetClass()
+        if (this.selectdata.actdefid != '1') {
+          await http.load('POST','rs/sql/applysingleTable', {
+            data: {
+              tablename: 't_actorperson',
+              condition: " userseq='" + this.$login.f.id + "' order by id desc"
+            }
+          }, {resolveMsg: null, rejectMsg: "角色人员是(登陆人)信息查询失败"}, {silent: true})
+            .then((res) => {
+              console.log("取得部门领导的角色" + res.data[0].actorid)
+              if (res.data[0].actorid.startsWith("R") && (res.data[0].actorid.includes("部门负责人") || res.data[0].actorid.includes("部经理")|| res.data[0].actorid.includes("部门领导") || res.data[0].actorid.includes("部负责人") || res.data[0].actorid.includes("部领导")||res.data[0].actorid.includes("组长"))) {
+                let loaderstr = res.data[0].actorid.substring(2, res.data[0].actorid.length - 1)
+                this.temploader = loaderstr
+                // 如果是退回的就用已经保存的人员，保证下发的是同一个人
+                this.toemployees()
+                let loademployeestr = null
+                if (loaderstr.includes("部门")) {
+                  loademployeestr = 'R(' + loaderstr.split("部门")[0] + '部门人员)'
+                } else if (loaderstr.includes("部")) {
+                  loademployeestr = 'R(' + loaderstr.split("部")[0] + '部人员)'
+                } else if (loaderstr.includes("组长")) {
+                  loademployeestr = 'R(' + loaderstr.split("组长")[0] + '人员)'
+                }
+                console.log(loademployeestr)
+                let http2 = new HttpResetClass()
+                http2.load('POST','rs/sql/applysingleTable', {
+                  data: {
+                    tablename: 't_role',
+                    condition: " name='" + loademployeestr.substring(2, loademployeestr.length - 1) + "'"
+                    // condition: " name='" + loaderstr.split("部")[0] + '部人员' + "'"
+                  }
+                }, {resolveMsg: null, rejectMsg: "角色人员(部门人员)id信息查询失败"}, {silent: true}).then((res) => {
+                  console.log("取得角色人员(部门人员)id" + JSON.stringify(res.data[0].id))
+                  let strid = res.data[0].id
+                  let http3 = new HttpResetClass()
+                  http3.load('POST','rs/sql/applysingleTable', {
+                    data: {
+                      tablename: 't_user',
+                      condition: "roles  like '%" + strid + "%'"
+                    }
+                  }, {resolveMsg: null, rejectMsg: "角色人员(部门人员)信息查询失败"}, {silent: true}).then((res) => {
+                    console.log("角色人员(部门人员)信息成功")
+                    for (var i = 0; i < res.data.length; i++) {
+                      this.employees.push({lable: res.data[i].name, value: res.data[i].name})
+                    }
+                  })
+                })
+              }
+            })
+        }
+      },
+      confirm() {
+        //判断当前节点的状态（开始活动/完工）
+        this.$resetpost('rs/sql/findProcessState', {data: {actid:this.selectdata.actid}}, {
+          resolveMsg: null,
+          rejectMsg: '提交错误！'
+        }).then((res) => {
+          console.log(">>>>>>>>>节点状态查询结果<<<<<<<<<<<", res)
+          if (res.data[0].state != '开始活动') {
+            this.$showMessage("该节点信息已在别处提交，请刷新！")
+            this.reset()
+          } else {
+              let data ={
+                tablename:'t_apply',
+                parameters:this.model
+              }
+              this.$resetpost('rs/logic/save',{data:data} )
+                .then(() => {
+                  this.reset()
+                })
+          }
+        })
+
+      },
+      commit() {
+        //判断当前节点的状态（开始活动/完工）
+        this.$resetpost('rs/sql/findProcessState', {data: {actid:this.selectdata.actid}}, {
+          resolveMsg: null,
+          rejectMsg: '提交错误！'
+        }).then((res) => {
+          console.log(">>>>>>>>>节点状态查询结果<<<<<<<<<<<", res)
+          if (res.data[0].state != '开始活动') {
+            this.$showMessage("该节点信息已在别处提交，请刷新！")
+            this.reset()
+          } else {
+            let getGen = gen(this, this.model)
+            co(getGen)
+          }
+        })
+      },
+      //退回上一个流程
+      back() {
+        // this.model.f_sub_state = '退回'
+        this.confirm()
+        let data = {
+          model: {
+            f_processid: this.selectdata.f_process_id,
+          },
+          loginUser: {
+            id: this.$login.f.id,
+            name: this.$login.f.name,
+            ename: this.$login.f.ename
+          },
+          subdep: '退回'
+        }
+        let http = new HttpResetClass()
+        http.load('POST',`rs/logic/ignitionnext`,
+          {data: data})
+          .then(() => {
+            this.reset()
+          })
+      },
+
+      //数据校验
+      verification() {
+
+      },
+      reset() {
+        this.$dispatch('close')
+        this.$dispatch('selfsearch')
+      },
+      setselect() {
+        this.selectdata.f_gas_type = this.selectdata.f_gas_type ? this.selectdata.f_gas_type : this.model.f_gas_type
+        this.selectdata.f_survey_name = this.selectdata.f_survey_name ? this.selectdata.f_survey_name : this.model.f_survey_name
+        this.model = Object.assign({}, this.model, this.selectdata)
+        this.model.f_survey_date = this.$login.toStandardDateString()
+        this.model.f_survey_department = this.$login.f.f_parentname
+        this.model.f_survey_operator = this.$login.f.name
+      }
+    },
+    watch: {
+      'model.f_ismaterial_complete'(val){
+
+        if(val === true){
+          this.buttonName = '提交'
+        }else{
+          this.buttonName = '申请材料'
+        }
+      }
+    }
+  }
+</script>