apply-clients 3.0.4 → 3.0.5-4

package/src/components/product/Function/Service/FunctionServiceControl.vue

@@ -1,19 +1,25 @@
 <template>
   <div>
-    <service-view :data="data" v-if="showview"></service-view>
+    <service-view :data="data" v-if="showview" v-ref:serviceview></service-view>
     <installfee :infee="selectdata" v-if="showinfee"></installfee>
     <!--预存款-->
     <preparationfee :selectdata="selectdata" v-if="showpreparation"></preparationfee>
     <!--预存报建收费-->
     <prestorefee :infee="selectdata" v-if="showprestorefee" v-ref:prestorefee></prestorefee>
+    <!--材料导入-->
+    <material-message v-if="showmaterialmessage" v-ref:material
+                      :selectdata="selectdata"
+                      :state="2"
+                      :flag ="'fc'"
+                      :edit="true"></material-message>
     <!-- 费用变更 -->
     <!--<updatefee :upfee="selectdata" v-if="showupfee"></updatefee>-->
     <!-- 费用减免 -->
     <!--<reducefee :redufee="selectdata" v-if="showreducefee"></reducefee>-->
     <!-- 购货方信息 -->
-    <buyer-message v-ref:buyermessagev :selectdata="selectdata" v-if="showbuyer"   ></buyer-message>
+    <buyer-message v-ref:buyermessagev :selectdata="selectdata" :state="1" v-if="showbuyer"   ></buyer-message>
     <!-- 领取材料 -->
-    <receive-batch :selectdata="selectdata" v-if="showreceivebatch" ></receive-batch>
+    <receive-batch :selectdata="selectdata"  :state="1" v-if="showreceivebatch" ></receive-batch>
     <!-- 添加合同 -->
     <addcontract :addcontract="selectdata" v-if="showcontract"></addcontract>
     <!-- 终止报建 -->
@@ -42,10 +48,35 @@
         showstop: false, // 终止报建
         showbill: false, // 打印票据
         showpreparation: false, // 预付款
-        show_material:false//报建材料
+        show_material:false,//报建材料
+        showmaterialmessage:false, // 显示材料导入
       }
     },
     methods: {
+      getmodel(){
+        return {}
+      },
+      // 材料导入
+      materialImport(){
+        this.$parent.$refs.installselect.clifun(this.selectdata)
+        // this.selectdata = row
+        this.$parent.clishow= true
+        this.$parent.show = false
+
+        this.showbuyer = false
+        this.showreceivebatch = false
+        this.show_material = false
+        this.showview = false
+        this.showinfee = false
+        this.showprestorefee = false
+        this.showupfee = false
+        this.showreducefee = false
+        this.showstop = false
+        this.showcontract = false
+        this.showbill = false
+        this.showpreparation = false
+        this.showmaterialmessage = true
+      },
       // 购货方信息
       buyerMessage(){
         this.$parent.$refs.installselect.clifun(this.selectdata)
@@ -54,6 +85,7 @@
         this.$parent.show = false
 
         this.showbuyer = true
+        this.showmaterialmessage = false
         this.showreceivebatch = false
         this.show_material = false
         this.showview = false
@@ -74,6 +106,7 @@
         this.$parent.show = false
 
         this.showreceivebatch = true
+        this.showmaterialmessage = false
         this.showbuyer = false
         this.show_material = false
         this.showview = false
@@ -94,6 +127,7 @@
         this.$parent.show = false
 
         this.show_material = true
+        this.showmaterialmessage = false
         this.showbuyer = false
         this.showreceivebatch = false
         this.showview = false
@@ -114,6 +148,7 @@
         this.$parent.show = false
 
         this.showreceivebatch = false
+        this.showmaterialmessage = false
         this.showbuyer = false
         this.show_material = false
         this.showview = false
@@ -134,6 +169,7 @@
         this.$parent.show = false
 
         this.showreceivebatch = false
+        this.showmaterialmessage = false
         this.showbuyer = false
         this.showview = false
         this.showinfee = false
@@ -154,6 +190,7 @@
         this.$parent.show = false
 
         this.showreceivebatch = false
+        this.showmaterialmessage = false
         this.showbuyer = false
         this.showview = false
         this.showinfee = false
@@ -174,6 +211,7 @@
         this.$parent.show = false
 
         this.showreceivebatch = false
+        this.showmaterialmessage = false
         this.showbuyer = false
         this.showview = false
         this.showupfee = false
@@ -200,6 +238,7 @@
         this.$parent.show = false
 
         this.showreceivebatch = false
+        this.showmaterialmessage = false
         this.showbuyer = false
         this.showview = false
         this.showbill = false
@@ -275,6 +314,9 @@
           if(this.funcdata.title==='派工单'){
             this.receiveBatch()
           }
+          if(this.funcdata.title==='材料导入'){
+            this.materialImport()
+          }
         }
       }
     },
@@ -295,6 +337,7 @@
           }
         }
         */
+        this.$refs.serviceview.update();
       },
       // 获取view层button事件
       async 'button'(model){

package/src/components/product/Function/functions/AddContract.vue

@@ -1,134 +1,131 @@
 <template>
-  <div class="col-sm-12" style="height: auto">
-  <div class="auto select-overspread">
-    <div class="panel panel-info">
-      <div class="panel-heading auto">
-        <h3 class="panel-title">补充协议</h3>
+  <div class="col-sm-12" style="height: auto" v-if="refresh">
+    <div class="auto select-overspread">
+      <div class="panel panel-info">
+        <div class="panel-heading auto">
+          <h3 class="panel-title">补充协议</h3>
+        </div>
       </div>
     </div>
-  </div>
-  <div  class="col-sm-12" style="height: auto">
-    <span class="col-sm-1"></span>
-    <span class="col-sm-3">总个数:{{contract_datas.length}}</span>
-    <span class="col-sm-2"></span>
-    <span class="col-sm-3" v-if="!$login.f.f_fengongsi.includes('彩虹')">总金额:{{sum}}元</span>
-    <button class="col-sm-offset-2 btn btn-warning" type="button"  @click="add()">补充协议</button>
-  </div>
-  <div class="col-sm-12" style="height: auto;border:1px solid #000;padding-top: 10px;" v-for="row in contract_datas">
-    <div class="col-sm-12">
-      <div class="form-group col-sm-3 form-input-group">
-        <label class="control-label">合同编号：</label>
-        <div class="col-sm-6">
-          <input class="form-control" type="text" v-model="row.f_contract_number" readonly>
+    <div class="col-sm-12" style="height: auto">
+      <span class="col-sm-1"></span>
+      <span class="col-sm-3">总个数:{{contract_datas.length}}</span>
+      <span class="col-sm-2"></span>
+      <span class="col-sm-3" v-if="!$login.f.f_fengongsi.includes('彩虹')">总金额:{{sum}}元</span>
+    </div>
+
+    <table  class="table table-bordered table-striped table-hover">
+      <tr style="background-color: #00A3F0">
+        <th style="border-color: #00A3F0"><font color="white">序号</font></th>
+        <th v-for="title in titles" style="text-align: center;border-color: #00A3F0">
+          <nobr><font color="white">{{title}}</font></nobr>
+        </th>
+        <th style="text-align: center;border-color: #00A3F0;padding: 0px" v-if="edit">
+          <button type="button" @click="add()" class="btn btn-warning">
+            +
+          </button>
+        </th>
+      </tr>
+      <tr v-for="(j,row) in contract_datas">
+        <td style="text-align: center">{{$index+1}}</td>
+        <td v-for="key in fields" style="text-align: center">
+          {{row[key]}}
+        </td>
+        <td style="text-align: center">
+          <!--<a href="#" @click="revise(i,j)">修改</a>-->
+          <!--|<a href="#" @click="deleted(i,j)">删除</a>-->
+        </td>
+      </tr>
+    </table>
+
+    <modal :show.sync="show" 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="addcontract.f_contract_number" readonly>
         </div>
-      </div>
-      <div class="form-group col-sm-3 form-input-group">
-        <label class="control-label">类型(合同/协议)：</label>
-        <div class="col-sm-6">
-          <input class="form-control" type="text" v-model="row.f_contract_type" readonly>
+        <div class="from-group">
+          <label>签订日期</label>
+          <div>
+            <datepicker width="600.76px;"
+                        :value.sync="addItem.f_contract_time"
+                        :format="'yyyy-MM-dd'"
+                        v-model="addItem.f_contract_time" readonly="readonly"
+                        :show-reset-button="reset">
+            </datepicker>
+          </div>
         </div>
-      </div>
-      <div class="form-group col-sm-3 form-input-group">
-        <label class="control-label">签订日期：</label>
-        <div class="col-sm-6">
-          <input class="form-control" type="text" v-model="row.f_contract_time" readonly>
+        <div class="from-group">
+          <label>合同金额(元)</label>
+          <input type="text" class="form-control" v-model="addItem.f_contract_money">
         </div>
-      </div>
-    </div>
-    <div class="col-sm-12">
-      <div class="form-group col-sm-3 form-input-group">
-        <label class="control-label">合同金额(元):</label>
-        <div class="col-sm-6">
-          <input class="form-control" type="text" v-model="row.f_contract_money" readonly>
+        <!--<div class="form-group">-->
+          <!--<label class="control-label">金额大写：</label>-->
+          <!--<input class="form-control" type="text" v-model="getCapital" readonly>-->
+        <!--</div>-->
+
+        <div class="from-group">
+          <label>付款方式</label>
+          <v-select :options="jiaofei"
+                    v-model="addItem.f_pay_type" :value.sync="addItem.f_pay_type" close-on-select>
+          </v-select>
         </div>
-      </div>
-      <div class="form-group col-sm-3 form-input-group">
-        <label class="control-label">金额大写：</label>
-        <div class="col-sm-6">
-          <input class="form-control" type="text" v-model="row.f_capital" readonly>
+        <div class="from-group">
+          <label>备注</label>
+          <textarea class="form-control" v-model="addItem.t_remarks" rows="3"></textarea>
         </div>
-      </div>
-      <div class="form-group col-sm-3 form-input-group">
-        <label class="control-label">合同性质：</label>
-        <div class="col-sm-6">
-          <input class="form-control" type="text" v-model="row.f_contract_nature" readonly>
-        </div>
-      </div>
-    </div>
-    <div class="form-group col-sm-12 form-input-group">
-      <label class="control-label">缴费类型：</label>
-      <div class="col-sm-5">
-        <textarea class="form-control" v-model="row.f_pay_type" rows="3" readonly></textarea>
-      </div>
-    </div>
-    <div class="form-group col-sm-12 form-input-group">
-      <label class="control-label">备注：</label>
-      <div class="col-sm-5">
-        <textarea class="form-control" v-model="row.t_remarks" rows="2" readonly></textarea>
-      </div>
-    </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
+        <button v-show="show" type="button" class="btn btn-success" @click='confirm'>确认</button>
+      </footer>
+    </modal>
   </div>
-  <modal :show.sync="show" 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="addcontract.f_contract_number" readonly>
-      </div>
-      <div class="from-group">
-        <label>签订日期</label>
-        <div>
-          <datepicker width="600.76px;"
-                      :value.sync="addItem.f_contract_time"
-                      :format="'yyyy-MM-dd'"
-                      v-model="addItem.f_contract_time" readonly="readonly"
-                      :show-reset-button="reset">
-          </datepicker>
-        </div>
-      </div>
-      <div class="from-group">
-        <label>合同金额(元)</label>
-        <input type="text" class="form-control" v-model="addItem.f_contract_money">
-      </div>
-      <div class="form-group">
-        <label class="control-label">金额大写：</label>
-        <input class="form-control" type="text" v-model="getCapital" readonly>
-      </div>
-
-      <div class="from-group">
-        <label>缴费类型</label>
-        <v-select :options="jiaofei"
-                  v-model="addItem.f_pay_type" :value.sync="addItem.f_pay_type" close-on-select>
-        </v-select>
-      </div>
-      <div class="from-group">
-        <label>备注</label>
-        <textarea class="form-control" v-model="addItem.t_remarks" rows="3"></textarea>
-      </div>
-    </article>
-    <footer slot="modal-footer" class="modal-footer">
-      <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
-      <button v-show="show" type="button" class="btn btn-success" @click='confirm'>确认</button>
-    </footer>
-  </modal>
-</div>
 </template>
 
 <script>
   import {HttpResetClass} from 'vue-client'
 
+  // Date格式化
+  Date.prototype.Format = function (fmt) {
+    var o = {
+      "M+": this.getMonth() + 1, //月份
+      "d+": this.getDate(), //日
+      "H+": this.getHours(), //小时
+      "m+": this.getMinutes(), //分
+      "s+": this.getSeconds(), //秒
+      "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+      "S": this.getMilliseconds() //毫秒
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+      if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+  }
   export default {
 
     title: "追加合同",
-    props: ['addcontract'],
+    props: {
+      addcontract:{},
+      edit:{
+        default:true
+      }
+    },
     data() {
       return {
+        model:{
+          rows:[]
+        },
+        titles:['合同编号','签订日期','合同金额','付款方式','合同价格类型','合同类型','提交人','备注'],
+        fields:['f_contract_number','f_contract_time','f_contract_money','f_pay_type','f_contract_nature','f_contract_type','f_operator','f_remarks'],
         contract_datas: [],    // 合同信息数组
+        refresh: true,
         show: false, // 新增合同模态框控制
-        addItem: null, // 模态框零时对象
+        addItem: {}, // 模态框零时对象
       }
     },
     ready() {
@@ -140,9 +137,19 @@
       //   t_remarks: 5
       // }, //测试数据
       //   {f_contract_number: 1, f_contract_money: 9, f_contract_time: 2, f_pay_type: 3, t_remarks: 5}
+      this.addItem.f_contract_time = new Date().Format('yyyy-MM-dd')
       this.load();
     },
     methods: {
+      // 新增按钮触发事件
+      add() {
+        if (this.contract_datas) {
+          this.addItem.f_contract_time = new Date().Format('yyyy-MM-dd')
+          this.show = true
+        } else {
+          this.$showMessage("请先在主流程中签订合同")
+        }
+      },
       // 小写转换大写
       smalltoBIG(n) {
         let fraction = ['角', '分'];
@@ -168,6 +175,9 @@
           s = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + s;
         }
         return head + s.replace(/(零.)*零元/, '元').replace(/(零.)+/g, '零').replace(/^整$/, '零元整')
+      },
+      events:{
+
       },
       // 获取数据库数据
       async load() {
@@ -178,31 +188,32 @@
         }
         let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {resolveMsg: null, rejectMsg: '获取合同表失败'})
         this.contract_datas = []
-        res.data.forEach((item,index)=>{
-          if(item.f_contract_nature.includes("\"")){
+        res.data.forEach((item, index) => {
+          if (item.f_contract_nature&&typeof item.f_contract_nature =='string' &&item.f_contract_nature.includes("\"")) {
             item.f_contract_nature = item.f_contract_nature.split("\"")[1]
           }
-          if(item.f_pay_type.includes("\"")){
+          if (item.f_pay_type&& typeof item.f_pay_type == 'string'   &&item.f_pay_type.includes("\"")) {
             item.f_pay_type = item.f_pay_type.split("\"")[1]
           }
         })
         this.contract_datas = res.data
       },
       // 新增按钮触发事件
-      add() {
-        if(this.contract_datas){
-          this.show = true
-        }else{
-          this.$showMessage("请先在主流程中签订合同")
-        }
-      },
+      // add() {
+      //   if (this.contract_datas) {
+      //     this.addItem.f_contract_time = new Date().Format('yyyy-MM-dd')
+      //     this.show = true
+      //   } else {
+      //     this.$showMessage("请先在主流程中签订合同")
+      //   }
+      // },
       // 模态框确定按钮触发
       async confirm() {
-        if(this.addItem.f_contract_money){
+        if (this.addItem.f_contract_money) {
           let http = new HttpResetClass();
           this.addItem.f_contract_nature = this.addcontract.f_contract_nature
           this.addItem.f_contract_number = this.addcontract.f_contract_number
-          this.addItem.processid = this.addcontract.f_process_id
+          this.addItem.f_process_id = this.addcontract.f_process_id
           this.addItem.f_contract_type = '补充协议'
           this.addItem.applyid = this.addcontract.f_apply_num
           this.addItem.f_operator = this.$login.f.name
@@ -211,20 +222,30 @@
           this.contract_datas.push(this.addItem)
 
           this.applyparam = {
-              id:this.addcontract.id,
-              f_contract_money : Number(this.addcontract.f_contract_money)+Number(this.addItem.f_contract_money),
-              f_budget_money : Number(this.addcontract.f_budget_money)+Number(this.addItem.f_contract_money),
-              f_unaccounts_money : Number(this.addcontract.f_unaccounts_money)+Number(this.addItem.f_contract_money),
-              f_residual_invoicing : Number(this.addcontract.f_residual_invoicing)+Number(this.addItem.f_contract_money),
-              f_additional_payment: Number(this.addcontract.f_additional_payment)+Number(this.addItem.f_contract_money)
+            id: this.addcontract.id,
+            f_contract_money: Number(this.addcontract.f_contract_money) + Number(this.addItem.f_contract_money),
+            f_budget_money: Number(this.addcontract.f_budget_money) + Number(this.addItem.f_contract_money),
+            f_unaccounts_money: Number(this.addcontract.f_unaccounts_money) + Number(this.addItem.f_contract_money),
+            f_residual_invoicing: Number(this.addcontract.f_residual_invoicing) + Number(this.addItem.f_contract_money),
+            f_additional_payment: Number(this.addcontract.f_additional_payment) + Number(this.addItem.f_contract_money)
           }
-          await http.load('POST', 'rs/logic/saveentity', {data:{tablename:'t_contract',parameters:this.addItem}}, {resolveMsg: null, rejectMsg: "添加失败"})
+          await http.load('POST', 'rs/logic/saveentity', {
+            data: {
+              tablename: 't_contract',
+              parameters: this.addItem
+            }
+          }, {resolveMsg: null, rejectMsg: "添加失败"})
             .then((res) => {
-              this.$resetpost('rs/logic/saveentity',{data:{tablename:'t_apply',parameters:this.applyparam}}).then((res) => {
-                  this.close()
+              this.$resetpost('rs/logic/saveentity', {
+                data: {
+                  tablename: 't_apply',
+                  parameters: this.applyparam
+                }
+              }).then((res) => {
+                this.close()
               })
             })
-        }{
+        }else{
           this.$showMessage("请输入金额")
         }
 
@@ -233,19 +254,20 @@
       // 模态框关闭按钮触发
       close() {
         this.show = false
-        this.addItem = null
+        this.addItem = {}
+        this.addItem.f_contract_time = new Date().Format('yyyy-MM-dd')
       }
 
     },
     watch: {
-        'selectdata.f_process_id'() {
-            this.load()
-        }
+      'addcontract.f_process_id'() {
+        this.load()
+      }
     },
     computed: {
       // 计算大写
       getCapital() {
-        if (this.addItem.f_contract_money) {
+        if (this.addItem.f_contract_money) {合同价格类型
           this.addItem.f_capital = this.smalltoBIG(Number(this.addItem.f_contract_money))
         }
         return this.addItem.f_capital
@@ -259,8 +281,8 @@
         return num
       },
       jiaofei() {
-        return this.$appdata.getParam('缴费类型')
-        // return [{label: '全部', value: ''}, ...AppData.getParam('缴费类型')]
+        return this.$appdata.getParam('付款方式')
+        // return [{label: '全部', value: ''}, ...AppData.getParam('付款方式')]
       }
     }
   }