apply-clients 3.2.41 → 3.2.50

package/src/components/product/Ledger/FacilityManagement/FacilityInventory/addoldFacilityInformation.vue

@@ -0,0 +1,326 @@
+<template>
+  <div class="select-overspread" style="background-color: #ffffff;padding: 20px;overflow: scroll">
+    <form class="form-horizontal">
+      <div class="form-group">
+        <!-- 添加设备 -->
+        <validator name="v">
+          <div class="col-sm-12">
+            <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
+              <template partial='head'>
+                <tr>
+                  <th style="white-space: nowrap;">序号</th>
+                  <th style="white-space: nowrap;">设备编码</th>
+                  <th style="white-space: nowrap;">设备名称</th>
+                  <th style="white-space: nowrap;">设备型号</th>
+                  <th style="white-space: nowrap;">设备规格</th>
+                  <th style="white-space: nowrap;">设备金额</th>
+                  <th style="white-space: nowrap;">购买日期</th>
+                  <th style="white-space: nowrap;">质保期（月）</th>
+                  <th style="white-space: nowrap;">备注</th>
+                  <th style="white-space: nowrap;">
+                    <button @click="$parent.$parent.openModal()" type="button" class="btn btn-info">
+                      <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+                    </button>
+                  </th>
+                </tr>
+              </template>
+              <template partial='body'>
+                <tr>
+                  <td style="text-align: center;">{{$index+1}}</td>
+                  <td style="text-align: center;">{{row.f_facility_number}}</td>
+                  <td style="text-align: center;">{{row.f_facility_name}}</td>
+                  <td style="text-align: center;">{{row.f_facility_model}}</td>
+                  <td style="text-align: center;">{{row.f_facility_norm}}</td>
+                  <td style="text-align: center;">{{row.f_facility_money}}</td>
+                  <td style="text-align: center;">{{row.f_purchase_date}}</td>
+                  <td style="text-align: center;">{{row.f_warranty}}</td>
+                  <td style="text-align: center;">{{row.f_remarks}}</td>
+                  <td style="text-align: center;">
+                    <button type="button" name="button" class="btn btn-link" @click="$parent.$parent.openUpdateFacility($index,row)">修改</button>
+                    <button type="button" name="button" class="btn btn-link" @click="$parent.$parent.deleteFacility($index)">删除</button>
+                  </td>
+                </tr>
+              </template>
+            </data-grid>
+          </div>
+          <div class="col-sm-12 form-group" style="text-align: center">
+            <button class="btn btn-primary" :disabled='!($v.valid && model.data.length > 0)' @click.prevent="addoldFacility()">保存</button>
+          </div>
+        </validator>
+
+        <validator name="mv">
+          <modal v-if="showFacility" :show.sync="showFacility" backdrop="false" large>
+            <header slot="modal-header" class="modal-header">
+              <button type="button" class="close" @click="closeModal()"><span>&times;</span></button>
+              <span class="modal-title"><font size="3">添加材料</font></span>
+            </header>
+            <article slot="modal-body" class="form-horizontal modal-body clearfix">
+              <div class="col-sm-12 form-group" :class="[$mv.f_facility_name.required ? 'has-error' : '']">
+                <label class="control-label col-sm-2">设备名称</label>
+                <div class="col-sm-9">
+                  <input class="form-control" type="text"  v-model="facility.f_facility_name" :value="facility.f_facility_name"/>
+                </div>
+              </div>
+              <div class="col-sm-12 form-group" :class="[$mv.f_facility_model.required ? 'has-error' : '']">
+                <label class="control-label col-sm-2">设备型号</label>
+                <div class="col-sm-9">
+                  <input class="form-control" type="text"  v-model="facility.f_facility_model" :value="facility.f_facility_model"/>
+                </div>
+              </div>
+              <div class="col-sm-12 form-group" :class="[$mv.f_facility_norm.required ? 'has-error' : '']">
+                <label class="control-label col-sm-2">设备规格</label>
+                <div class="col-sm-9">
+                  <input class="form-control" type="text"  v-model="facility.f_facility_norm" :value="facility.f_facility_norm"/>
+                </div>
+              </div>
+              <div class="col-sm-12 form-group" :class="[$mv.f_facility_money.required ? 'has-error' : '']">
+                <label class="control-label col-sm-2">设备金额</label>
+                <div class="col-sm-9">
+                  <input class="form-control" type="number"  v-model="facility.f_facility_money" :value="facility.f_facility_money"/>
+                </div>
+              </div>
+              <div class="col-sm-12 form-group" :class="[$mv.f_facility_number.required ? 'has-error' : '']">
+                <label class="control-label col-sm-2">设备编码</label>
+                <div class="col-sm-9">
+                  <input class="form-control" type="text" @change="changFacilityNumber()"  v-model="facility.f_facility_number" :value="facility.f_facility_number"/>
+                </div>
+              </div>
+              <div class="col-sm-12 form-group" :class="[$mv.f_purchase_date.required ? 'has-error' : '']">
+                <label class="control-label col-sm-2">购买日期</label>
+                <div class="col-sm-9">
+                  <input v-show="false" type="text"  v-model="facility.f_purchase_date" />
+                  <datepicker
+                    format="yyyy-MM-dd"
+
+                    :value.sync="facility.f_purchase_date"
+                    v-model="facility.f_purchase_date">
+                  </datepicker>
+                </div>
+              </div>
+              <div class="col-sm-12 form-group" :class="[$mv.f_warranty.required ? 'has-error' : '']">
+                <label class="control-label col-sm-2">质保期（月）</label>
+                <div class="col-sm-9">
+                  <input class="form-control" type="number" v-model="facility.f_warranty" :value="facility.f_warranty"/>
+                </div>
+              </div>
+              <div class="col-sm-12 form-group">
+                <label class="control-label col-sm-2">备&emsp;&emsp;注</label>
+                <div class="col-sm-9">
+                  <textarea
+                    class="form-control input_view"
+                    style="width: 100%;height: 100%"
+                    rows="2"
+                    v-model="facility.f_remarks"
+                    :value="facility.f_remarks"
+                  >
+                  </textarea>
+                </div>
+              </div>
+            </article>
+            <footer slot="modal-footer" class="modal-footer">
+              <button class="btn btn-primary" type="button" @click.prevent="saveOrUpdateFacility()" :disabled='!$mv.valid'>确认</button>
+            </footer>
+          </modal>
+        </validator>
+      </div>
+    </form>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+  import {isEmpty} from '../../../../Util'
+  export default {
+    title: '设备信息',
+    data () {
+      return {
+        contractList: [],
+        contract: {},
+        contractFacility: [],
+        model: {
+          data: []
+        },
+        showFacility: false,
+        facility: {},
+        index: null
+      }
+    },
+    ready () {
+    },
+    methods: {
+      // 添加设备
+      addoldFacility () {
+        let data = {
+          contract: this.contract,
+          data: this.model.data
+        }
+        this.$dispatch('addoldFacility', data)
+      },
+      // 检查设备编号
+      async changFacilityNumber () {
+        let http = new HttpResetClass()
+
+        if (isEmpty(this.facility)) {
+          return
+        }
+
+        let data = {
+          tablename: 't_facility',
+          condition: `f_facility_number = '${this.facility.f_facility_number}'`
+        }
+
+        let res = await http.load(
+          'POST',
+          `rs/sql/singleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '设备编码查询失败！！！'}
+        )
+
+        if (res.data.length > 0) {
+          this.facility.f_facility_number = null
+          this.$showAlert('该设备编码已存在！！！', 'warning', 3000)
+          return
+        }
+        let flag = this.model.data.some(item => {
+          if (item.f_facility_number === this.facility.f_facility_number) {
+            return true
+          }
+          return false
+        })
+        if (flag) {
+          this.facility.f_facility_number = null
+          this.$showAlert('该设备编码已存在！！！', 'warning', 3000)
+          return
+        }
+      },
+      // 打开修改
+      async openUpdateFacility (index, facility) {
+        await this.getContractFacility()
+
+        this.index = index
+        this.facility = JSON.parse(JSON.stringify(facility))
+
+        this.showFacility = true
+      },
+      // 删除
+      async deleteFacility (index) {
+        this.index = index
+        await this.$showMessage('您确定要删除这条记录吗？').then((res) => {
+          if (res === 'confirm') {
+            this.model.data.splice(this.index, 1)
+          }
+        })
+        this.closeModal()
+      },
+      // 添加或修改
+      saveOrUpdateFacility () {
+        if (isEmpty(this.index)) {
+          this.model.data.push(this.facility)
+        } else {
+          this.model.data.splice(this.index, 1, this.facility)
+        }
+
+        this.closeModal()
+      },
+      // 关闭
+      closeModal () {
+        this.showFacility = false
+        this.index = null
+        this.facility = null
+        this.contractFacility = []
+      },
+      async openModal () {
+        this.showFacility = true
+      },
+      async getContractFacility () {
+        let data = {
+          tablename: 't_contract_facility',
+          condition: `f_contract_id = ${this.contract.id}`
+        }
+
+        let res = await this.$resetpost(
+          `rs/sql/singleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '合同采购设备查询失败！！！'}
+        )
+
+        res.data.forEach(item => {
+          this.contractFacility.push({
+            'label': `${item.f_facility_name}--${item.f_facility_model}--${item.f_facility_norm}--${item.f_facility_money}`,
+            'value': item
+          })
+        })
+      },
+    },
+    events: {
+    }
+  }
+</script>
+
+<style scoped>
+  .item{
+    height: 40px;
+    margin-bottom: 20px;
+  }
+
+  th{
+    font-size: 15px !important;
+    text-align: center !important;
+    background-color: #dfedfb!important;
+    color: #666666 !important;
+    font-family: PINGFANG-BOLD !important;
+    font-weight: normal!important;
+  }
+  /*清除model中的浮动*/
+  .clearfix:after,.clearfix:before{
+    display: table;
+  }
+  .clearfix:after{
+    clear: both;
+  }
+
+  .input_view{
+    padding: 8px;
+    background-color: #ffffff;
+    border-radius: 2px;
+    border: solid 1px #c7c7c7!important;
+    color: #333333!important;
+    font-size: 15px!important;
+  }
+
+  .input_view[readonly]{
+    border: 1px solid #DDD!important;
+    /*background-color: #F5F5F5;*/
+    color:#ACA899!important;
+  }
+  .input_view:disabled{
+    border: 1px solid #DDD!important;
+    /*background-color: #F5F5F5;*/
+    color:#ACA899!important;
+  }
+
+  .control-label-justify {
+    display: inline-block;
+    vertical-align: top;
+    width: 110px;
+    text-align: justify;
+    font-family: PingFang-SC-Bold;
+  }
+
+  .control-label-justify::after {
+    content: "";
+    display: inline-block;
+    width: 70px;
+    overflow: hidden;
+    height: 0;
+  }
+
+  input::-webkit-outer-spin-button,
+  input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+  }
+
+  input[type="number"] {
+    -moz-appearance: textfield;
+  }
+</style>

package/src/components/product/Ledger/FileDownload/FileDownload.vue

@@ -0,0 +1,42 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <tabset v-ref:tabs :close="false">
+        <tab header='模板上传及下载' style="background-color :#ffffff!important;overflow: auto;">
+          <apply-upload :blodid="selectdata.blodid"
+                        :isupload="true"
+                        :isdelete="true"
+                        :isusetype="true"
+                        :isremark="true"
+                        :issearch="true"
+                        :takeimg="false">
+
+          </apply-upload>
+        </tab>
+      </tabset>
+    </div>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+
+  export default {
+    title: '文件模板',
+    data() {
+      return {
+        selectdata: {
+          blodid: '公共'
+        }
+      }
+    },
+    created() {
+    },
+    methods: {},
+    events: {},
+    watch: {},
+    ready() {
+    }
+  }
+
+</script>

package/src/components/product/Ledger/Function/InstallInfoSelect.vue

@@ -178,7 +178,7 @@
           }
         }),
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('项目类型')],
-        projectTypes: [{label: '全部', value: ''}],
+        projectTypes: [{label: '全部', value: ''},...this.$appdata.getParam('工程类型')],
         projectAreas: [{label: '全部', value: ''}, ...this.$appdata.getParam('项目区域')], // 所有报建类型
         defnames: [{label: '全部', value: ''}], // 流程节点
         funcs: [], // 功能列表
@@ -199,8 +199,11 @@
           }, {resolveMsg: null, rejectMsg: null}).then((res) => {
             this.defnames = [{label: '全部', value: ''}, ...res.data]
           })
+
+          this.projectTypes = [{label: '全部', value: ''}, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}工程类型`)]
         } else {
           this.defnames = [{label: '全部', value: ''}]
+          this.projectTypes = [{label: '全部', value: ''}]
         }
       },
       // 权限控制

package/src/components/product/Ledger/ImportApply/ImportApply.vue

@@ -0,0 +1,68 @@
+<template>
+  <div class="auto p-10">
+    <div class="form-group col-sm-12 button-range">
+      <button class="button_clear button_spacing" @click="openImport('主体')">主体项目导入</button>
+      <button class="button_clear button_spacing" @click="openImport('客户')">客户项目导入</button>
+    </div>
+
+    <modal :show.sync="showFile" v-ref:modal backdrop="true" title="选择文件">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
+        <h4 class="modal-title">选择文件</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="form-group">
+          <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer"></footer>
+    </modal>
+  </div>
+</template>
+<script>
+import Vue from 'vue'
+import {HttpResetClass} from 'vue-client'
+export default {
+  title: '导入',
+  data () {
+    return {
+      showFile: false,
+      type: null
+    }
+  },
+  created () {
+  },
+  methods: {
+    openImport (type) {
+      this.type = type
+      this.showFile = true
+    },
+    closeFile () {
+      this.showFile = false
+      // 将选的文件清空
+      this.$refs.file.$el.querySelector('input').value = ''
+    }
+  },
+  events: {
+    async 'onFileUpload'(file, result) {
+      console.log('文件上传成功！！！')
+      console.log(file)
+      console.log(result)
+
+      let data = {
+        type: this.type,
+        filepath: result.f_downloadpath,
+        user: this.$login.f
+      }
+      let res = await this.$resetpost(`rs/logic/importApply`, {data:data}, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0)
+
+      console.log('===============================')
+      console.log(res.data)
+
+      this.closeFile()
+    }
+  },
+  watch: {
+  }
+}
+</script>

package/src/components/product/Ledger/MaterialManagement/DeliveryRecord/DeliveryRecordList.vue

@@ -1,4 +1,4 @@
-<template>
+  <template>
   <criteria-paged :model="model" v-ref:cp>
     <criteria partial='criteria' @condition-changed='search' v-ref:cri>
       <div class="form-horizontal select-overspread container-fluid auto" partial>
@@ -19,6 +19,12 @@
                    v-on:keyup.enter="$parent.$parent.search()" condition="o.f_cea_number like '%{}%'" placeholder='CEA号'>
           </div>
           <div class="form-group col-sm-3 button-range">
+            <export-excel :data="$parent.$parent.getCondition"
+                          :field="$parent.$parent.getfield"
+                          sqlurl="rs/logic/exportfile"
+                          sql-name="getMaterialDelivery"
+                          template-name='出库记录'
+                          :choose-col="true"></export-excel>
             <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
             <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
             <div
@@ -116,7 +122,8 @@
           <th style="white-space: nowrap;">材料名称</th>
           <th style="white-space: nowrap;">材料型号</th>
           <th style="white-space: nowrap;">材料规格</th>
-          <th style="white-space: nowrap;">单价</th>
+          <th style="white-space: nowrap;">含税单价</th>
+          <th style="white-space: nowrap;">不含税单价</th>
           <th style="white-space: nowrap;">单位</th>
           <th style="white-space: nowrap;">合同号</th>
           <th style="white-space: nowrap;">厂家</th>
@@ -150,6 +157,9 @@
           <td style="text-align: center;">
             <nobr><font>{{row.f_price}}</font></nobr>
           </td>
+          <td style="text-align: center;">
+            <nobr><font>{{row.f_noprice}}</font></nobr>
+          </td>
           <td style="text-align: center;">
             <nobr><font>{{row.f_unit}}</font></nobr>
           </td>
@@ -218,7 +228,25 @@ export default {
           orgid: this.$login.f.orgid
         }
       }),
-      criteriaShow: false
+      criteriaShow: false,
+      getfield: {
+        'f_material_name': '材料名称',
+        'f_material_model': '材料型号',
+        'f_material_norm': '材料规格',
+        'f_price': '含税单价',
+        'f_noprice': '不含税单价',
+        'f_unit': '单位',
+        'f_contract_number': '合同号',
+        'f_supplier': '厂家',
+        'f_ticket_number': '出库票号',
+        'f_cea_number': 'CEA号',
+        'f_delivery_quantity': '出库数量',
+        'f_picking_unit': '领料单位',
+        'f_picking_site': '领料工地',
+        'f_delivery_date': '出库时间',
+        'f_delivery_operator': '操作人',
+        'f_delivery_remarks': '备注'
+      }
     }
   },
   ready () {
@@ -237,6 +265,14 @@ export default {
     }
   },
   computed: {
+    getCondition() {
+      return {
+        condition: this.$refs.cp.$refs.cri.condition,
+        data: {
+          orgid: this.$login.f.orgid
+        }
+      }
+    }
   }
 }
 </script>

package/src/components/product/Ledger/MaterialManagement/InventoryInformation/InventoryInformationList.vue

@@ -18,6 +18,12 @@
             <div class="form-group col-sm-6 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
               <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
+              <export-excel :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.getfield"
+                            sqlurl="rs/logic/exportfile"
+                            sql-name="getMaterial"
+                            template-name='材料库存记录'
+                            :choose-col="true"></export-excel>
               <button class="button_new button_spacing"  @click="$parent.$parent.openPurchaseOrder()">采购单</button>
               <button class="button_new button_spacing"  @click="$parent.$parent.openPurchaseMaterial()">采购入库</button>
               <button class="button_new button_spacing"  @click="$parent.$parent.openReturnMaterial()">还料入库</button>
@@ -71,7 +77,8 @@
           <th style="white-space: nowrap;">材料名称</th>
           <th style="white-space: nowrap;">材料型号</th>
           <th style="white-space: nowrap;">材料规格</th>
-          <th style="white-space: nowrap;">单价</th>
+          <th style="white-space: nowrap;">含税单价</th>
+          <th style="white-space: nowrap;">不含税单价</th>
           <th style="white-space: nowrap;">单位</th>
           <th style="white-space: nowrap;">合同号</th>
           <th style="white-space: nowrap;">厂家</th>
@@ -97,6 +104,9 @@
           <td :class="row.f_stock > 0 ? (row.iswarning === 'true' ? 'warning' : '') : 'danger'" style="text-align: center;" @click="$parent.$parent.$parent.view(row)">
             <nobr><font>{{row.f_price}}</font></nobr>
           </td>
+          <td :class="row.f_stock > 0 ? (row.iswarning === 'true' ? 'warning' : '') : 'danger'" style="text-align: center;" @click="$parent.$parent.$parent.view(row)">
+            <nobr><font>{{row.f_noprice}}</font></nobr>
+          </td>
           <td :class="row.f_stock > 0 ? (row.iswarning === 'true' ? 'warning' : '') : 'danger'" style="text-align: center;" @click="$parent.$parent.$parent.view(row)">
             <nobr><font>{{row.f_unit}}</font></nobr>
           </td>
@@ -160,7 +170,19 @@ export default {
           orgid: this.$login.f.orgid
         }
       }),
-      criteriaShow: false
+      criteriaShow: false,
+      getfield: {
+        'f_material_name': '材料名称',
+        'f_material_model': '材料型号',
+        'f_material_norm': '材料规格',
+        'f_price': '含税单价',
+        'f_noprice': '不含税单价',
+        'f_unit': '单位',
+        'f_contract_number': '合同号',
+        'f_supplier': '厂家',
+        'f_stock': '库存结余',
+        'f_prepare_quantity': '预出库'
+      }
     }
   },
   ready () {
@@ -206,6 +228,14 @@ export default {
     }
   },
   computed: {
+    getCondition() {
+      return {
+        condition: this.$refs.cp.$refs.cri.condition,
+        data: {
+          orgid: this.$login.f.orgid
+        }
+      }
+    }
   }
 }
 </script>

package/src/components/product/Ledger/MaterialManagement/InventoryInformation/MaterialInformation.vue

@@ -34,7 +34,7 @@
             </div>
           </div>
           <div class="col-sm-4 form-group item">
-            <label class="control-label-justify control-label col-sm-6">单价</label>
+            <label class="control-label-justify control-label col-sm-6">含税单价</label>
             <div class="col-sm-6">
               <input class="form-control input_view" style=""
                      type="number"