apply-clients 3.0.5-2 → 3.0.5-21

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>

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

@@ -467,7 +467,7 @@
             } else {
               data = {
                 tablename: this.data.onetomany[index].tables[0],
-                condition: `f_apply_num = '${this.selectdata.f_apply_num}'  and f_process_id='${this.selectdata.f_process_id}'`
+                condition: `f_process_id = '${this.selectdata.f_process_id}'`
               }
             }
             let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
@@ -510,6 +510,24 @@
         }
         // 初始化 fields
         for (let i = 0; i < this.data.fields.length; i++) {
+          // 下发人 options 处理，options初始化
+          if (this.data.fields[i].source) {
+            let http = new HttpResetClass()
+            await http.load('POST', 'rs/search', `{"source":${this.data.fields[i].source},"userid":"${this.$login.f.id}"}`, {
+              resolveMsg: null,
+              rejectMsg: null
+            }).then((res) => {
+              console.log("search查询部门下所有人:", res.data)
+              let array = []
+              for (let k = 0; k < res.data.length; k++) {
+                array.push({
+                  label: res.data[k].name,
+                  value: {id: res.data[k].id, name: res.data[k].name}
+                })
+              }
+              this.data.fields[i].options = array
+            })
+          }
 
           /*
               {
@@ -1691,7 +1709,7 @@
         //所有选择框/输入框遍历
         for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
           //任何是否的选择框只要是否都不能提交
-          if (this.selectdata.defname != '客户申请') {
+          /*if (this.selectdata.defname != '客户申请') {
             if (this.$refs.service_show.data.fields[i].value === '否') {
               this.$refs.service_show.disable_button = false
               console.log(this.$refs.service_show.data)
@@ -1701,7 +1719,7 @@
             }else {
               this.$refs.service_show.data.buttons[1].button_name = '提交'
             }
-          }
+          }*/
           //时间到期提醒
           if (this.$refs.service_show.data.fields[i].label.includes("时间") || this.$refs.service_show.data.fields[i].label.includes("工期")) {
             let setTime = this.$refs.service_show.data.fields[i].value
@@ -1712,14 +1730,14 @@
               this.$showMessage("请注意，当前节点时间/工期已过期！")
             }
           }
-          if (this.$refs.service_show.data.fields[i].label.includes("验收结果")) {
+          /*if (this.$refs.service_show.data.fields[i].label.includes("验收结果")) {
 
             if (this.$refs.service_show.data.fields[i].value.length == 0 || this.$refs.service_show.data.fields[i].value == undefined || this.$refs.service_show.data.fields[i].value == null){
               this.$showMessage("验收结果未填写完毕，无法提交")
               this.$refs.service_show.data.buttons[1].button_name = '保存'
             }
 
-          }
+          }*/
         }
 
 
@@ -1774,7 +1792,7 @@
             }
           }
         }
-        if (this.selectdata.defname = '现场勘察') {
+        if (this.selectdata.defname == '现场勘察') {
           let projectAddress = ''
           for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
             if (this.$refs.service_show.data.fields[i].label === '项目地址') {
@@ -1893,6 +1911,22 @@
           }
         }
 
+        if (this.data.onetomany[i].tables[0] == 't_use_gas_param') {
+          if (this.data.onetomany[i].fields[j].label == '单台用气量Nm³/h') {
+               if (this.$refs.service_show.showadd_fields.fields[j-1].value){
+                 let a = Number.parseInt(this.$refs.service_show.showadd_fields.fields[j-1].value)*Number.parseInt(this.$refs.service_show.showadd_fields.fields[j].value)
+                 this.$refs.service_show.showadd_fields.fields[j+1].value = a
+               }else {
+                 this.$showAlert('数量不能为空！！','warning', 3000)
+               }
+          }
+          if (this.data.onetomany[i].fields[j].label == '数量') {
+            if (this.$refs.service_show.showadd_fields.fields[j+1].value){
+              let a = Number.parseInt(this.$refs.service_show.showadd_fields.fields[j].value)*Number.parseInt(this.$refs.service_show.showadd_fields.fields[j+1].value)
+              this.$refs.service_show.showadd_fields.fields[j+2].value = a
+            }
+          }
+        }
 
       },
       async 'onetomanyevent'(datas) {
@@ -1911,6 +1945,32 @@
       ,
       // 获取view层button事件/
       async 'button'(model) {
+        // 终止报建
+        if(
+         ( model.button.button_name === '提交' || model.button.button_name === '移交') &&
+          (model.f_approach_flag === '未通过' || model.f_flag_start === '未通过' || model.f_install_idea_ys === '未通过' || model.f_material_flag === '未通过')
+        ){
+          let val = this.$refs.service_show.data
+          delete val.id
+          val.f_operat_type = '终止报建'
+          val.f_state = '有效'
+          val.f_describe = this.$refs.service_show.data.f_user_name + '已终止报建'
+          val.processid = model.f_process_id
+          val.f_operator = this.$login.f.name
+          val.f_department = this.$login.f.f_department
+          val.f_stop_remarks=this.$refs.service_show.data.defname+'未通过'
+          let data ={
+            tablename:'t_stopapply',
+            parameters:val
+          }
+
+          this.$refs.service_show.data.applyid = this.selectdata.id
+           await this.$resetpost('rs/logic/save', {data:data})
+          await  this.$resetpost('rs/logic/stopapply', {data: this.$refs.service_show.data})
+          this.$dispatch('close')
+          this.initializtion()
+          return
+        }
         // console.log("button事件接收参数：", model)
         // 点击重置按钮就重置数据
         if (model.button.button_name === '重置') {
@@ -2338,6 +2398,12 @@
         //   }
         // }
         // ===================>青白江特殊流程开始，合并分支时请忽略这段代码  结束
+        if(model.button.button_name === '提交' && this.$refs.service_show.data.defname === '客户申请' && this.$refs.service_show.model.f_cell_type === '新小区' ){
+             model.button.button_name ='跳过'
+        }
+        if(model.button.button_name === '提交' && (this.$refs.service_show.data.defname === '费用缴纳' || this.$refs.service_show.data.defname === '费用确认' ) && this.$refs.service_show.model.f_pay_flag === '否' ){
+          model.button.button_name ='跳过'
+        }
         console.log('本次点击button执行的操作是=>' + operate)
         model = Object.assign({}, this.selectdata, model)
         let http = new HttpResetClass()
@@ -2386,7 +2452,7 @@
         requestData.workflow_xmlfilename = this.$workflow_vue.workflow_xmlfilename
         requestData.employeetemplate = ''
         console.log('即将发送请求url=>' + url + ',参数=>' + JSON.stringify(requestData))
-        let res = res = await http.load('POST', url, {data: requestData}, {resolveMsg: null, rejectMsg: '数据保存失败'})
+        let res  = await http.load('POST', url, {data: requestData}, {resolveMsg: null, rejectMsg: '数据保存失败'})
         console.log("service处理完成返回数据：", JSON.stringify(res.data))
         if (res.data.code == 200) {
           model = res.data.model

package/src/components/product/ServiceView.vue

@@ -154,6 +154,11 @@
             </table>
           </div>
         </div>
+
+        <div v-for="(i,item) in data.components">
+          <component :is="item.name" :selectdata="data" :mark="item.mark" ></component>
+        </div>
+
         <div class="col-sm-12 form-group text-center" style="padding-top:8px">
           <div class="form-group  col-sm-3 center-block">
             <label class=" col-sm-5 control-label control-label-justify">所属公司：</label>
@@ -182,7 +187,13 @@
           <div class="col-sm-3 form-group center-block">
             <label class="control-label control-label-justify col-sm-5">操作日期：</label>
             <div class="col-sm-6">
-              <input style="width: 95px" type="text" class="form-control" disabled v-model="model.f_operate_date"/>
+              <datepicker id="startDate"
+                          v-model="model.f_operate_date"
+                          :value.sync="model.f_operate_date"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd'"
+              ></datepicker>
+<!--              <input style="width: 95px" type="text" class="form-control"  v-model="model.f_operate_date"/>-->
             </div>
           </div>
         </div>