apply-clients 3.0.5-2 → 3.0.5-3

package/src/components/product/Process/ProcessInfo/history_control.vue

@@ -1,139 +1,139 @@
-<template>
-  <div class="auto" style="padding-right:5px; padding-top: 10px;" v-if="refreshed">
-    <validator name="v">
-
-      <div v-for="(index,item) in data" class="panel" v-bind:class="{'panel-default': showpanl[index].showdef, ' panel-info ' : showpanl[index].showinfo}">
-        <div :class="{'panel-heading  background-default':showpanl[index].show,'panel-heading':!showpanl[index].show}" @click ="hello(index)">
-          <h3 class="panel-title">{{item.title}}信息<span class="pull-right  glyphicon" v-bind:class="{'glyphicon-chevron-right': showpanl[index].show, 'glyphicon-chevron-down' : showpanl[index].hasError}"></span></h3>
-        </div>
-        <div class="panel-body" v-if="showpanl[index].hasError">
-          <div class="col-sm-12">
-            <div v-for="(index2,row) in item.fields">
-              <span v-if="row.hasOwnProperty('field')" class="col-sm-12">{{item.fields[index2].label}}：{{item.fields[index2].value}}</span>
-              <span v-else class="col-sm-12" v-for="(index3,arr) in row.items">{{arr.label}}：{{arr.value?'是':'否'}}</span>
-            </div>
-          </div>
-        </div>
-      </div>
-
-    </validator>
-  </div>
-</template>
-<script>
-  import  {HttpResetClass} from 'vue-client'
-  export default {
-    title: '通气点火信息',
-    data () {
-      return {
-        data:null,
-        defnames:null,
-        refreshed:true,
-        showpanl:[]
-      }
-    },
-    props: ['selectdata'],
-    methods: {
-      // 初始化  [{label:xx,value:vvv,filed}]
-      initializtion(){
-        let tempArray =[]
-        // 按照数据库defname的顺序排序
-        for(let i = 0;i<this.defnames.length;i++){
-          // 配置文件title循环
-          for(let j = 0;j<this.$workflow_vue.activitys.length;j++){
-            if(this.defnames[i].defname===this.$workflow_vue.activitys[j].title){
-              let temp = JSON.parse(JSON.stringify(this.$workflow_vue.activitys[j]))
-              if(this.defnames[i].hasOwnProperty('person')){
-                temp.person = this.defnames[i].person
-              }
-              this.showpanl.push({hasError:false,show:true,showdef:true,showinfo:false})
-              tempArray.push(temp)
-            }
-          }
-        }
-        // 给排序后的数组填充数据
-        for(let i=0;i<tempArray.length;i++){
-          for(let j = 0;j<tempArray[i].fields.length;j++){
-            if(tempArray[i].fields[j].hasOwnProperty('field')){
-              if((tempArray[i].fields[j].label=='项目预算金额' ||
-                tempArray[i].fields[j].label=='设计费成本' ||
-                tempArray[i].fields[j].label=='材料预算成本' ||
-                tempArray[i].fields[j].label=='施工预算成本' ||
-                tempArray[i].fields[j].label=='探伤预算成本' ||
-                tempArray[i].fields[j].label=='检测预算成本' ||
-                tempArray[i].fields[j].label=='其他预算成本' ||
-                tempArray[i].fields[j].label=='首付'||
-                tempArray[i].fields[j].label=='进度款'||
-                tempArray[i].fields[j].label=='尾款' ) && this.$login.f.f_parentname !== '市场部'){
-                tempArray[i].fields[j].value = '隐藏数据'
-              }else{
-                tempArray[i].fields[j].value = this.selectdata[tempArray[i].fields[j].field]
-              }
-
-            }else if(tempArray[i].fields[j].hasOwnProperty('items')){
-              for(let k = 0;k<tempArray[i].fields[j].items.length;k++){
-                tempArray[i].fields[j].items[k].value = this.selectdata[tempArray[i].fields[j].items[k].field]
-              }
-            }
-            if(tempArray[i].fields[j].value&&typeof tempArray[i].fields[j].value =='string'&&tempArray[i].fields[j].value.startsWith('{')&&tempArray[i].fields[j].value.endsWith('}')){
-              let temp = JSON.parse(tempArray[i].fields[j].value)
-              tempArray[i].fields[j].value = temp.name
-            }
-          }
-        }
-        this.data = tempArray
-        this.refreshed =false
-        this.$nextTick(()=>{
-          this.refreshed =true
-          this.hello(9999999)
-        })
-      },
-      hello (index) {
-        if (!this.selectdata.defname) {
-          return
-        }
-        if(index==9999999){
-          console.log("this.showpanl:"+this.showpanl)
-          this.showpanl[0].hasError = true
-          return
-        }
-        if (this.showpanl[index].show) {
-          this.showpanl[index].show = false
-          this.showpanl[index].hasError = true
-        } else {
-          this.showpanl[index].show = true
-          this.showpanl[index].hasError= false
-        }
-      }
-    },
-    watch:{
-      async 'selectdata'(){
-        let http = new HttpResetClass()
-        var  temp = []
-        if(this.selectdata){
-          let res = await http.load('POST','rs/sql/getdefname',{data:{processid:this.selectdata.f_process_id}},{resolveMsg:null, rejectMsg:null})
-          //循环去除回退导致重复的节点
-          for (var i = 0; i < res.data.length; i++) {
-            var flag = true
-            for (var j = 0; j< temp.length; j++){
-              if(res.data[i].defname == temp[j].defname){
-                flag = false
-              }
-            }
-            if(flag){
-              temp.push(res.data[i])
-            }
-          }
-          this.defnames = temp
-        }
-        // 初始化开始
-        this.initializtion()
-      }
-    }
-  }
-</script>
-<style scoped>
-  .background-default{
-    background-color: #F2F6FA;
-  }
-
-</style>
+<template>
+  <div class="auto" style="padding-right:5px; padding-top: 10px;" v-if="refreshed">
+    <validator name="v">
+
+      <div v-for="(index,item) in data" class="panel" v-bind:class="{'panel-default': showpanl[index].showdef, ' panel-info ' : showpanl[index].showinfo}">
+        <div :class="{'panel-heading  background-default':showpanl[index].show,'panel-heading':!showpanl[index].show}" @click ="hello(index)">
+          <h3 class="panel-title">{{item.title}}信息<span class="pull-right  glyphicon" v-bind:class="{'glyphicon-chevron-right': showpanl[index].show, 'glyphicon-chevron-down' : showpanl[index].hasError}"></span></h3>
+        </div>
+        <div class="panel-body" v-if="showpanl[index].hasError">
+          <div class="col-sm-12">
+            <div v-for="(index2,row) in item.fields">
+              <span v-if="row.hasOwnProperty('field')" class="col-sm-12">{{item.fields[index2].label}}：{{item.fields[index2].value}}</span>
+              <span v-else class="col-sm-12" v-for="(index3,arr) in row.items">{{arr.label}}：{{arr.value?'是':'否'}}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+
+    </validator>
+  </div>
+</template>
+<script>
+  import  {HttpResetClass} from 'vue-client'
+  export default {
+    title: '通气点火信息',
+    data () {
+      return {
+        data:null,
+        defnames:null,
+        refreshed:true,
+        showpanl:[]
+      }
+    },
+    props: ['selectdata'],
+    methods: {
+      // 初始化  [{label:xx,value:vvv,filed}]
+      initializtion(){
+        let tempArray =[]
+        // 按照数据库defname的顺序排序
+        for(let i = 0;i<this.defnames.length;i++){
+          // 配置文件title循环
+          for(let j = 0;j<this.$workflow_vue.activitys.length;j++){
+            if(this.defnames[i].defname===this.$workflow_vue.activitys[j].title){
+              let temp = JSON.parse(JSON.stringify(this.$workflow_vue.activitys[j]))
+              if(this.defnames[i].hasOwnProperty('person')){
+                temp.person = this.defnames[i].person
+              }
+              this.showpanl.push({hasError:false,show:true,showdef:true,showinfo:false})
+              tempArray.push(temp)
+            }
+          }
+        }
+        // 给排序后的数组填充数据
+        for(let i=0;i<tempArray.length;i++){
+          for(let j = 0;j<tempArray[i].fields.length;j++){
+            if(tempArray[i].fields[j].hasOwnProperty('field')){
+              if((tempArray[i].fields[j].label=='项目预算金额' ||
+                tempArray[i].fields[j].label=='设计费成本' ||
+                tempArray[i].fields[j].label=='材料预算成本' ||
+                tempArray[i].fields[j].label=='施工预算成本' ||
+                tempArray[i].fields[j].label=='探伤预算成本' ||
+                tempArray[i].fields[j].label=='检测预算成本' ||
+                tempArray[i].fields[j].label=='其他预算成本' ||
+                tempArray[i].fields[j].label=='首付'||
+                tempArray[i].fields[j].label=='进度款'||
+                tempArray[i].fields[j].label=='尾款' ) && this.$login.f.f_parentname !== '市场部'){
+                tempArray[i].fields[j].value = '隐藏数据'
+              }else{
+                tempArray[i].fields[j].value = this.selectdata[tempArray[i].fields[j].field]
+              }
+
+            }else if(tempArray[i].fields[j].hasOwnProperty('items')){
+              for(let k = 0;k<tempArray[i].fields[j].items.length;k++){
+                tempArray[i].fields[j].items[k].value = this.selectdata[tempArray[i].fields[j].items[k].field]
+              }
+            }
+            if(tempArray[i].fields[j].value&&typeof tempArray[i].fields[j].value =='string'&&tempArray[i].fields[j].value.startsWith('{')&&tempArray[i].fields[j].value.endsWith('}')){
+              let temp = JSON.parse(tempArray[i].fields[j].value)
+              tempArray[i].fields[j].value = temp.name
+            }
+          }
+        }
+        this.data = tempArray
+        this.refreshed =false
+        this.$nextTick(()=>{
+          this.refreshed =true
+          this.hello(9999999)
+        })
+      },
+      hello (index) {
+        if (!this.selectdata.defname) {
+          return
+        }
+        if(index==9999999){
+          console.log("this.showpanl:"+this.showpanl)
+          this.showpanl[0].hasError = true
+          return
+        }
+        if (this.showpanl[index].show) {
+          this.showpanl[index].show = false
+          this.showpanl[index].hasError = true
+        } else {
+          this.showpanl[index].show = true
+          this.showpanl[index].hasError= false
+        }
+      }
+    },
+    watch:{
+      async 'selectdata'(){
+        let http = new HttpResetClass()
+        var  temp = []
+        if(this.selectdata){
+          let res = await http.load('POST','rs/sql/getdefname',{data:{processid:this.selectdata.f_process_id}},{resolveMsg:null, rejectMsg:null})
+          //循环去除回退导致重复的节点
+          for (var i = 0; i < res.data.length; i++) {
+            var flag = true
+            for (var j = 0; j< temp.length; j++){
+              if(res.data[i].defname == temp[j].defname){
+                flag = false
+              }
+            }
+            if(flag){
+              temp.push(res.data[i])
+            }
+          }
+          this.defnames = temp
+        }
+        // 初始化开始
+        this.initializtion()
+      }
+    }
+  }
+</script>
+<style scoped>
+  .background-default{
+    background-color: #F2F6FA;
+  }
+
+</style>

package/src/components/product/Process/Processes/ApplyUpload.vue

@@ -144,10 +144,18 @@ export default {
         condition += `and fusetype like '${this.useType}'`
       }
       let http = new HttpResetClass()
-      let data = {
-        tablename: 't_files',
-        condition: condition + ` order by f_uploaddate desc `
+      if (this.$login.f.rolesnames.includes('部长')){
+        var data = {
+          tablename: 't_files',
+          condition: condition  +` order by f_uploaddate desc `
+        }
+      }else {
+         data = {
+          tablename: 't_files',
+          condition: condition + ` and f_username = '${this.headers.username}'` +` order by f_uploaddate desc `
+        }
       }
+
       let getFile = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
         warnMsg: null,
         resolveMsg: null

package/src/components/product/Process/Processes/CustomerCostPlan.vue

@@ -0,0 +1,214 @@
+<template>
+  <div style="text-align: center;" v-if="refresh">
+    <div class="span" style="margin-top: 10px;height: auto;min-height: 200px;width: 92%">
+      <partial-view v-ref:single-load>
+        <data-grid :model="model" v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th>序号</th>
+              <th>名称</th>
+              <th>金额(元)</th>
+              <th>备注</th>
+              <th v-if="$parent.$parent.$parent.mark === 0">
+                <button type="button" name="button" class="btn btn-info" @click="$parent.$parent.$parent.add()">新增收费</button>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <td style="text-align: center">{{ $index + 1 }}</td>
+            <td style="text-align: center">{{ row.f_costplan_name }}</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.$parent.mark === 0">
+              <button type="button" name="button" class="btn btn-link"
+                      @click.stop="$parent.$parent.$parent.modifyParam(row)">修改
+              </button>
+              <button type="button" name="button" class="btn btn-link"
+                      @click.stop="$parent.$parent.$parent.deleteItem(row)">删除
+              </button>
+            </td>
+          </template>
+        </data-grid>
+      </partial-view>
+     <span>合计：{{f_cost_sum}}元</span>
+    </div>
+  </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 type="text" class="form-control" v-model="addItem.f_costplan_name">
+      </div>
+      <div class="from-group">
+        <label>金额(元)</label>
+        <input type="number" class="form-control" v-model="addItem.f_fee" >
+      </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'>确认</button>
+    </footer>
+  </modal>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import $ from 'jquery'
+
+export default {
+  title: '合同签订',
+  data () {
+    return {
+      refresh: true,
+      showpay: false, // 新增成本计划开关
+      model: {
+        rows: [] // 材料成本数据数组
+      },
+      addItem:{},
+      f_cost_sum:0,
+     // costplan:['施工成本','材料成本','设计费','监理费','管理费','税金']
+    }
+  },
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  ready () {
+    this.load()
+  },
+  methods: {
+    async load () {
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_cost_plan',
+        condition: `f_process_id = '${this.selectdata.f_process_id}'`
+      }
+      let res = await http.load('POST', '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)
+          }
+        })
+    },
+    /*// 初始化成本计划
+    async fcostplan(){
+      let http = new HttpResetClass()
+      let data = {
+        tablename: 't_cost_plan',
+        condition: `f_process_id = '${this.selectdata.f_process_id}'`
+      }
+      let number = await http.load("post",'rs/sql/checkcostplan', {data: data},{resolveMsg: null, rejectMsg: '获取数据失败'})
+      if (number.data[0].num =='0'){
+        for (let i=0;i<this.costplan.length;i++){
+          this.addItem.f_costplan_name = this.costplan[i]
+          if (this.costplan[i]=='材料成本'){
+            let data1 = {
+              applyNum: `mb.f_apply_num='${this.selectdata.f_apply_num}'`
+            }
+            await  http.load('POST', 'rs/logic/material_cost', {data: data1}, {
+              resolveMsg: null,
+              rejectMsg: 'material_cost失败'
+            }).then((res) => {
+              if (res.data[0]['']=='null'||res.data[0]['']==null){
+                this.addItem.f_fee = 0
+              }else {
+                this.addItem.f_fee = res.data[0]['']
+              }
+            })
+          }else {
+            this.addItem.f_fee = 0
+          }
+          this.addItem.f_process_id = this.selectdata.f_process_id
+          this.addItem.f_apply_num = this.selectdata.f_apply_num
+          this.addItem.f_operator = this.$login.f.name
+          this.addItem.f_department = this.$login.f.f_parentname
+          this.addItem.f_filiale = this.$login.f.f_fengongsi
+          await http.load('POST', 'rs/logic/addcostplan', this.addItem, {resolveMsg:null, rejectMsg: '保存失败'})
+        }
+        this.load()
+      }
+    },*/
+    // 关闭模态框
+    close () {
+      this.showpay = false
+      this.addItem = null
+    },
+    // 模态框确定按钮保存数据
+    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 = this.$login.f.name
+      this.addItem.f_department = this.$login.f.f_parentname
+      this.addItem.f_filiale = this.$login.f.f_fengongsi
+      await http.load('POST', 'rs/logic/addcostplan', this.addItem, {resolveMsg: '保存成功', rejectMsg: '保存失败'})
+        .then((res) => {
+          this.close()
+          this.load()
+        })
+    },
+    deleteItem (row) {
+      let http = new HttpResetClass()
+      http.load('POST','rs/logic/delectcostplan', {data: row}, {resolveMsg: null, rejectMsg: '删除失败'})
+        .then((res) => {
+          this.load()
+        })
+    },
+    //新增收费 开启模态框
+    add () {
+      this.showpay = true
+    },
+    modifyParam(row){
+      this.addItem=row
+      this.showpay = true
+    },
+    /*async updateapply(){
+      let data={
+        id:this.selectdata.id,
+        f_cost_sum:this.f_cost_sum
+      }
+      this.$resetpost('rs/entity/t_apply', data,{resolveMsg: null, rejectMsg: '提交失败'})
+    }*/
+  },
+  watch: {}
+}
+
+</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>