apply-clients 3.2.48 → 3.2.51

package/src/components/product/Ledger/Process/ProcessSelect.vue

@@ -7,7 +7,7 @@
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">项目名称：</label>
                 <input type="text" class="input_search" style="width: 60%" v-model="model.f_entry_name"
-                       v-on:keyup.enter="$parent.$parent.search()" condition="u.f_entry_name like '%{}%'" placeholder='项目名称'>
+                       v-on:keyup.enter="$parent.$parent.search()" placeholder='项目名称'  condition="CHARINDEX('{}',u.f_entry_name)>0">
               </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">工程编号：</label>
@@ -26,6 +26,7 @@
                         v-if="this.$login.f.f_role_name.includes('信息录入')"
                         @click="$parent.$parent.showModal = !$parent.$parent.showModal">工程发起</button>
                 <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
+                <button class="button_search button_spacing" @click="$parent.$parent.comeback()" v-el:cx>返回</button>
                 <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
                 <div
                   :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
@@ -90,6 +91,18 @@
                        style="width: 60%"
                        condition="u.f_address like '%{}%'">
               </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">是否填写过交底时间</label>
+                <v-select
+                  v-model="model.isnull"
+                  placeholder='项目区域'
+                  condition="u.f_confess_time is not null and u.f_confess_time !='' and defname='工程前期' and f_apply_type='客户项目'"
+                  :value.sync="model.isnull"
+                  :options='$parent.$parent.isnull'
+                  class="select select_list"
+                  :value-single="true"
+                  close-on-select ></v-select>
+              </div>
             </div>
           </div>
       </criteria>
@@ -111,41 +124,41 @@
           </tr>
         </template>
         <template partial='body'>
-          <tr >
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+          <tr>
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{$index+1}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.f_entry_name}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.f_project_number}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.f_apply_type}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.f_project_type}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.f_project_area}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.f_contact}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.f_phone}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.f_cea_number}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.defname}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <nobr><font>{{row.f_address}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]&& [row.isnull==='有'?'you':'wu']" style="text-align: center;">
               <dropdown>
                 <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">
                   <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
@@ -202,6 +215,7 @@
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('项目类型')], // 所有报建类型
         projectTypes: [{label: '全部', value: ''},...this.$appdata.getParam('工程类型')],
         projectAreas: [{label: '全部', value: ''}, ...this.$appdata.getParam('项目区域')], // 所有报建类型
+        isnull: [{label:'有',value: '有'}],
         defnames: [{label: '全部', value: ''}], // 流程节点
         model: new PagedList('rs/sql/checkuser', 20, {
           data: {
@@ -231,6 +245,9 @@
       search () {
         this.$dispatch('search')
       },
+      comeback(){
+        this.$dispatch('comeback')
+      },
       // 根据项目类型获取对应的流程节点
       applyTypeChange () {
         if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
@@ -334,6 +351,14 @@
     color: #dc0b12;
     font-weight:bold
   }
+  .you {
+    color: #a94442;
+    font-weight:bold
+  }
+  .wu {
+    color: #222222;
+    font-weight:bold
+  }
   .p {
     color: #ffaf4f;
   }

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

@@ -296,6 +296,19 @@
       }
     },
     events: {
+      //工程前期限制事件
+      async 'limit'(){
+        debugger
+        let rolename=this.$login.f.f_role_name
+        debugger
+        if(rolename.includes('工程前期申报内容填写权限')) {
+          for (const item of this.show_data.fields) {
+            if (item.label === '申报单编码' || item.label === '申报单完成时间') {
+              item.disabled = false
+            }
+          }
+        }
+      },
       async 'addPEWelding'(index) {
         let data = {
           f_process_id : this.show_data.f_process_id,
@@ -458,6 +471,23 @@
       // 失去焦点出触发事件
       async 'onchange'(index) {
 
+        // cea号重复提醒
+        if(this.show_data.defname==='信息录入'){
+          if (this.show_data.fields[index].label==='CEA号'){
+          const cea=this.getLableValue('CEA号')
+            if(cea){
+              let pcdText =`and f_cea_number = '${cea}'`
+              new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data:{items:"*",tablename:"t_apply",condition:` f_sub_state != '终止' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+                console.log('请求发送完成！！！！！'+JSON.stringify(res))
+                if(res.data.length>0){
+                  this.$showAlert('该cea已经存在！！！', 'warning', 3000)
+                }
+              })
+
+          }
+        }
+        }
+
         if (this.show_data.defname === '编制合同') {
           if (this.show_data.fields[index].label==='室外安装费'||  this.show_data.fields[index].label==='室外甲供材'|| this.show_data.fields[index].label==='室外设备费'||this.show_data.fields[index].label==='室内安装费'||  this.show_data.fields[index].label==='室内甲供材'|| this.show_data.fields[index].label==='室内设备费') {
 
@@ -477,19 +507,15 @@
             let a1 = this.getLableValue('室外安装费')
             let b1 = this.getLableValue('室外甲供材')
             let c1=this.getLableValue('室外设备费')
-            if(this.show_data.f_project_type==='支线'||this.show_data.f_project_type==='主体') {
+
                 this.setLabelValue('室外税金', parseFloat(parseFloat(a1) * 0.03).toFixed(2))
-                this.setLabelValue('室外造价',  parseFloat(parseFloat(a1) + parseFloat(b1) + parseFloat(c1) + parseFloat(a1) * 0.03).toFixed(2))
-            }else{
-              this.setLabelValue('室外税金', parseFloat(parseFloat(parseFloat(a1) + parseFloat(b1) + parseFloat(c1)) * 0.03).toFixed(2))
-              this.setLabelValue('室外造价', parseFloat(parseFloat(a1) + parseFloat(b1) + parseFloat(c1)).toFixed(2))
+                this.setLabelValue('室外造价',  parseFloat(parseFloat(a1) + parseFloat(b1) + parseFloat(c1)).toFixed(2))
             }
-          }
           if(this.show_data.fields[index].label==='室内安装费'||  this.show_data.fields[index].label==='室内甲供材'|| this.show_data.fields[index].label==='室内设备费'){
             let a2 = this.getLableValue('室内安装费')
             let b2 = this.getLableValue('室内甲供材')
             let c2=this.getLableValue('室内设备费')
-            this.setLabelValue('室内税金', parseFloat(parseFloat(parseFloat(a2) + parseFloat(b2) +  parseFloat(c2)) * 0.03).toFixed(2))
+            this.setLabelValue('室内税金', parseFloat(parseFloat(a2) * 0.03).toFixed(2))
             this.setLabelValue('室内造价',parseFloat(parseFloat(a2) + parseFloat(b2) +  parseFloat(c2)).toFixed(2))
           }
 

package/src/components/product/Ledger/QinhuaMaterial/PickingRecord/PickingAddingMaterial.vue

@@ -0,0 +1,330 @@
+<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;">
+                    <button @click="$parent.$parent.openModal()" type="button" class="btn btn-info">
+                      <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+                    </button>
+                    <a href="/download/秦华材料批量导入模板.xlsx" type="button" class="btn btn-info">模板下载</a>
+                    <button @click="$parent.$parent.showFile = !$parent.$parent.showFile" type="button" class="btn btn-info">批量导入</button>
+                  </th>
+                </tr>
+              </template>
+              <template partial='body'>
+                <tr>
+                  <td style="text-align: center;">{{$index+1}}</td>
+                  <td style="text-align: center;">{{row.f_qhmaterial_coding}}</td>
+                  <td style="text-align: center;">{{row.f_qhmaterial_name}}</td>
+                  <td style="text-align: center;">{{row.f_qhmaterial_model}}</td>
+                  <td style="text-align: center;">{{row.f_qhmaterial_norm}}</td>
+                  <td style="text-align: center;">{{row.f_qhunit}}</td>
+                  <td style="text-align: center;">{{row.f_qhremarks}}</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_qhmaterial_coding.required ? 'has-error' : '']">
+                <label class="control-label col-sm-2">材料编码</label>
+                <div class="col-sm-9">
+                  <input class="form-control" type="text"  v-validate:f_qhmaterial_coding = "['required']" v-model="facility.f_qhmaterial_coding" :value="facility.f_qhmaterial_coding"/>
+                </div>
+              </div>
+              <div class="col-sm-12 form-group" :class="[$mv.f_qhmaterial_name.required ? 'has-error' : '']">
+                <label class="control-label col-sm-2">材料名称</label>
+                <div class="col-sm-9">
+                  <input class="form-control" type="text"  v-validate:f_unit = "['required']" v-model="facility.f_qhmaterial_name" :value="facility.f_qhmaterial_name"/>
+                </div>
+              </div>
+              <div class="col-sm-12 form-group" :class="[$mv.f_qhmaterial_model.required ? 'has-error' : '']">
+                <label class="control-label col-sm-2">材料型号</label>
+                <div class="col-sm-9">
+                  <input class="form-control" type="text" v-validate:f_unit = "['required']"  v-model="facility.f_qhmaterial_model" :value="facility.f_qhmaterial_model"/>
+                </div>
+              </div>
+              <div class="col-sm-12 form-group" :class="[$mv.f_qhmaterial_norm.required ? 'has-error' : '']">
+                <label class="control-label col-sm-2">材料规格</label>
+                <div class="col-sm-9">
+                  <input class="form-control" type="text" v-validate:f_unit = "['required']" v-model="facility.f_qhmaterial_norm" :value="facility.f_qhmaterial_norm"/>
+                </div>
+              </div>
+              <div class="col-sm-12 form-group" :class="[$mv.f_qhunit.required ? 'has-error' : '']">
+                <label class="control-label col-sm-2">单位</label>
+                <div class="col-sm-9">
+                  <input class="form-control" type="text" v-validate:f_unit = "['required']" v-model="facility.f_qhunit" :value="facility.f_qhunit"/>
+                </div>
+              </div>
+              <div class="col-sm-12 form-group" :class="[$mv.f_qhremarks.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_qhremarks" :value="facility.f_qhremarks"/>
+                </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>
+        <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>
+    </form>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+  import {isEmpty} from '../../../../Util'
+  export default {
+    title: '设备信息',
+    data () {
+      return {
+        showFile:false,
+        contractList: [],
+        contract: {},
+        material: {},
+        contractFacility: [],
+        model: {
+          data: []
+        },
+        showFacility: false,
+        facility: {},
+        index: null
+      }
+    },
+    ready () {
+    },
+    methods: {
+      closeFile () {
+        this.showFile = false
+        // 将选的文件清空
+        this.$refs.file.$el.querySelector('input').value = ''
+      },
+      // 添加设备
+      addoldFacility () {
+        let data = {
+          contract: this.contract,
+          data: this.model.data
+        }
+        this.$dispatch('addoldFacility', data)
+      },
+      // 打开修改
+      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 () {
+        debugger
+          let flag = this.model.data.some(item => {
+            debugger
+            if (
+              item.f_qhmaterial_coding === this.facility.f_qhmaterial_coding &&
+              item.f_qhmaterial_name === this.facility.f_qhmaterial_name &&
+              item.f_qhmaterial_norm === this.facility.f_qhmaterial_norm &&
+              item.f_qhmaterial_model === this.facility.f_qhmaterial_model &&
+              item.f_qhunit === this.facility.f_qhunit
+            ) {
+              return true
+            }
+            return false
+          })
+          if (flag) {
+            if (isEmpty(i)) {
+              this.$showAlert('该材料已经存在！！！', 'warning', 3000)
+            } else {
+              throw `第${i}行材料已经存在！！！`
+            }
+
+          } else {
+            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_qinhua_material',
+          condition: `1=1`
+        }
+
+        let res = await this.$resetpost(
+          `rs/sql/singleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '材料查询失败！！！'}
+        )
+debugger
+        res.data.forEach(item => {
+          this.contractFacility.push({
+            'label': `$${item.f_qhmaterial_coding}--${item.f_qhmaterial_name}$--${item.qhmaterial_model}--${item.f_qhmaterial_norm}--${item.f_qhunit}`,
+            'value': item
+          })
+        })
+      },
+    },
+    events: {
+      async 'onFileUpload'(file, result) {
+        let data = {
+          filepath: result.f_downloadpath
+        }
+        let res = await this.$resetpost(`rs/logic/addQhDaoru`, {data:data}, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0)
+
+        console.log('----------解析内容--------------')
+        console.log(res.data)
+
+        let i = 1
+        for (const item of res.data) {
+          debugger
+            this.facility = item.qinhua_material
+
+          try {
+            this.saveOrUpdateFacility(i)
+          } catch (e) {
+            this.$showAlert(e, 'danger', 3000)
+            this.closeFile()
+            return
+          }
+          i++
+          }
+
+        this.$showAlert(`成功导入${i}条数据`, 'success', 3000)
+        this.closeFile()
+      }
+    }
+  }
+</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>