apply-clients 3.4.3 → 3.4.4

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

@@ -0,0 +1,454 @@
+<template>
+  <div>
+    <data-grid :model="onetomany" class="list_area table_sy">
+      <template partial='head'>
+        <tr>
+          <th class="textNoLineBreak">序号</th>
+          <th class="textNoLineBreak">材料名称</th>
+          <th class="textNoLineBreak">材料型号</th>
+          <th class="textNoLineBreak">材料单位</th>
+          <th class="textNoLineBreak">材料数量</th>
+          <th class="textNoLineBreak">材料编号</th>
+          <th class="textNoLineBreak">材料标识</th>
+          <th class="textNoLineBreak">用户编号</th>
+          <th class="textNoLineBreak">
+            <button class="button_new button_spacing" type="button" @click="$parent.$parent.openMaterialModal()">添加</button>
+            <button type="button" class="btn btn-info head-but" v-if="$parent.$parent.mark === 0"
+                    @click="$parent.$parent.showFile = !$parent.$parent.showFile">导入</button>
+            <a type="button" class="btn btn-info head-but" v-if="$parent.$parent.mark === 0"
+               href="/apply/download/excel/材料明细.xlsx" download>模板下载</a>
+          </th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr>{{$index+1}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_name}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_style}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_unit}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_number}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_bjq_sid}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_material_code}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_userinfo_code}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <button type="button" class="button_search button_spacing" @click="$parent.$parent.updateMaterial($index,row)">修改</button>
+            <button type="button" class="button_delete button_spacing" @click="$parent.$parent.deleteMaterial(row)">删除</button>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+    <modal v-if="showFile" :show.sync="showFile" v-ref:modal :backdrop="false" 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="确定" v-ref:file></file-upload>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer"></footer>
+    </modal>
+    <modal v-if="showMaterialModal" :show.sync="showMaterialModal" v-ref:modal :large="true"
+           :backdrop="false" :title="title">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeMaterials"><span>&times;</span></button>
+        <h4 class="modal-title">{{title}}</h4>
+      </header>
+      <article slot="modal-body" class="modal-body clearfix">
+        <div v-for="(i,item) in materials" class="form-group col-sm-12 panel panel-info">
+          <div class="panel-heading head col-sm-12" style="background-color: #e8f4ff;margin-bottom: 10px">
+            <div class="col-sm-6 text-left">材料{{$index+1}}信息</div>
+            <div class="col-sm-6 text-right"><button
+              class="button_delete button_spacing"
+              @click.prevent="deleteDevicesinfo(i)"
+              v-if="title === '新增'"
+            >删除</button></div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">选择材料：</label>
+            <div class="col-sm-8">
+              <input-select
+                class="select select_list"
+                :value.sync="item.material"
+                v-model="item.material"
+                :options="meterialOptions"
+                :disable="mark === 1"
+                @change="modifyOtherValue(i)"
+                :valueSingle="true"></input-select>
+            </div>
+          </div>
+          <div class="form-group col-sm-6" :class="[item.f_material_name ? '' : 'has-error']">
+            <label class="col-sm-4 control-label">材料名称：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style="" type="text"
+                     placeholder="材料名称"
+                     v-model="item.f_material_name"
+                     :value="item.f_material_name"
+              />
+            </div>
+          </div>
+          <div class="form-group col-sm-6" :class="[item.f_material_style ? '' : 'has-error']">
+            <label class="col-sm-4 control-label">材料型号：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style="" type="text"
+                     placeholder="材料型号"
+                     v-model="item.f_material_style"
+                     :value="item.f_material_style"
+              />
+            </div>
+          </div>
+          <div class="form-group col-sm-6" :class="[item.f_material_unit ? '' : 'has-error']">
+            <label class="col-sm-4 control-label">材料单位：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style="" type="text"
+                     placeholder="材料单位"
+                     v-model="item.f_material_unit"
+                     :value="item.f_material_unit"
+              />
+            </div>
+          </div>
+          <div class="form-group col-sm-6" :class="[item.f_material_number ? '' : 'has-error']">
+            <label class="col-sm-4 control-label">材料数量：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style="" type="number"
+                     placeholder="设备数量"
+                     v-model="item.f_material_number"
+                     :value="item.f_material_number"
+              />
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">材料编号：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style="" type="text"
+                     placeholder="材料编号"
+                     v-model="item.f_bjq_sid"
+                     :value="item.f_bjq_sid"
+              />
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">材料标识：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style=""
+                     placeholder="材料标识"
+                     v-model="item.f_material_code"
+                     :value.sync="item.f_material_code"
+              />
+            </div>
+          </div>
+
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">用户编号：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style=""
+                     placeholder="用户编号"
+                     v-model="item.f_userinfo_code"
+                     :value.sync="item.f_userinfo_code"
+              />
+            </div>
+          </div>
+
+        </div>
+
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <template v-if="mark !== 1">
+          <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="pushMaterial()">添加材料</button>
+          <button type="button" class="btn btn-primary" v-if="title==='新增'" @click="addMaterial()" :disabled="!$v.valid">确认添加</button>
+          <button type="button" class="btn btn-primary" v-if="title==='修改'" @click="updateConfirm()" :disabled="!$v.valid">确认修改</button>
+        </template>
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass} from 'vue-client'
+  import Vue from "vue";
+  export default {
+    name: 'addMaterialScience',
+    props: {
+      selectdata: {
+        type: Object
+      },
+      mark: {
+        type: Number,
+        default: 0
+      }
+    },
+    data () {
+      return {
+        showFile: false,
+        onetomany: {
+          rows: []
+        },
+        title:'新增',
+        showMaterialModal:false,
+        materials:[
+          {
+            material:'',
+            f_material_name:'',
+            f_material_style:'',
+            f_material_unit:'',
+            f_material_number:'',
+            f_bjq_sid:'',
+            f_material_code:'',
+            f_userinfo_code:''
+          }
+        ],
+        meterialOptions:[],
+        row:{},
+        bjqChecklag:[]
+      }
+    },
+    ready(){
+      this.getOnetoManyData()
+    },
+    methods: {
+      async getOnetoManyData () {
+        let data = {
+          tablename: `t_material_apply`,
+          condition: `f_process_id='${this.selectdata.f_process_id}'`
+        }
+        let res = await this.$resetpost(
+          'rs/sql/singleTable',
+          {data: data},
+          {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
+        )
+        this.onetomany.rows = res.data
+      },
+      async openMaterialModal () {
+        this.getMateralNames()
+        this.title = '新增'
+        this.materials = [
+          {
+            material:'',
+            f_material_name:'',
+            f_material_style:'',
+            f_material_unit:'',
+            f_material_number:'',
+            f_bjq_sid:'',
+            f_material_code:'',
+            f_userinfo_code:''
+          }
+        ],
+        this.showMaterialModal = true
+      },
+      closeFile() {
+        this.showWork = false
+        this.showFile = false
+        // 将选的文件清空
+        this.$refs.file.$el.querySelector('input').value = ''
+        this.search()
+      },
+      deleteDevicesinfo (index) {
+        this.materials.splice(index, 1)
+      },
+      pushMaterial () {
+        this.materials.push({
+          material:'',
+          f_material_name:'',
+          f_material_style:'',
+          f_material_unit:'',
+          f_material_number:'',
+          f_bjq_sid:'',
+          f_material_code:'',
+          f_userinfo_code:''
+        })
+      },
+      // 获取模态框材料
+      async getMateralNames () {
+        let data = {
+          condition: `1=1`
+        }
+        let http = new HttpResetClass()
+        let res = await http.load(
+          'POST',
+          `rs/sql/getStockMaterial`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '材料查询失败！！！'}
+        )
+
+        this.meterialOptions = res.data.map(item => {
+          return {
+            'label': `${item.f_material_name}--${item.f_material_style}--${item.f_material_unit}--${item.f_material_code}`,
+            'value': item
+          }
+        })
+      },
+      modifyOtherValue (index){
+        console.log("进来了",index)
+        console.log("dddd",this.materials[index].material)
+        let material = this.materials[index].material
+        this.materials[index].f_material_name = material.f_material_name
+        this.materials[index].f_material_style = material.f_material_style
+        this.materials[index].f_material_unit = material.f_material_unit
+        this.materials[index].f_material_number = material.f_material_number
+        this.materials[index].f_material_code = material.f_material_code
+        this.materials[index].f_userinfo_code = material.f_userinfo_code
+      },
+      // 新增材料
+      async addMaterial () {
+        console.log("登录信息：",this.$login.f)
+        this.title = '新增'
+        let data = {
+          f_process_id : this.selectdata.f_process_id,
+          f_operator_id: this.$login.f.id,
+          f_operator: this.$login.f.name,
+          f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs,
+          materials:this.materials
+        }
+        //报警器流程 设备编号检验
+        await this.bjqCheck()
+        console.log("这是bjqChecklag数据:",this.bjqChecklag)
+        if (this.bjqChecklag.length > 0){
+          return
+        }
+        let res = await this.$resetpost(
+          `rs/logic/saveMaterials`,
+          data
+        )
+        this.closeMaterials()
+      },
+      async deleteMaterial (row) {
+        var show1 =  window.confirm('您确定要删除这条记录吗?')
+        if(show1 != true){
+          this.closeMaterials()
+        }else{
+          debugger
+          let http = new HttpResetClass()
+          let res = await http.load(
+            'POST',
+            `rs/logic/deleteMaterial`,
+            {data: row},
+            {resolveMsg: null, rejectMsg: '材料删除失败！！！'}
+          )
+          this.closeMaterials()
+        }
+
+      },
+      async updateMaterial (index,row) {
+        this.title = '修改'
+        this.row = row
+        this.getMateralNames()
+        this.materials = [
+          {
+            material:'',
+            f_material_name:row.f_material_name,
+            f_material_style:row.f_material_style,
+            f_material_unit:row.f_material_unit,
+            f_material_number:row.f_material_number,
+            f_material_code:row.f_material_code,
+            f_userinfo_code:row.f_userinfo_code,
+            f_bjq_sid: row.f_bjq_sid
+          }
+        ]
+        this.showMaterialModal = true
+      },
+      async updateConfirm () {
+        let data = this.row
+        data.f_material_name = this.materials[0].f_material_name
+        data.f_material_style = this.materials[0].f_material_style
+        data.f_material_unit = this.materials[0].f_material_unit
+        data.f_material_number = this.materials[0].f_material_number
+        data.f_material_code = this.materials[0].f_material_code
+        data.f_bjq_sid = this.materials[0].f_bjq_sid
+        data.f_userinfo_code = this.materials[0].f_userinfo_code
+        //报警器流程 设备编号检验
+        await this.bjqCheck()
+        if (this.bjqChecklag.length > 0){
+          return
+        }
+        let res = await this.$resetpost(
+          `rs/entity/t_material_apply`,
+          data
+        )
+        this.closeMaterials()
+      },
+      sycronizedCode(index,val){
+        console.log("看看：",index,val)
+        this.materials[index].f_material_code = val
+      },
+      closeMaterials () {
+        this.getOnetoManyData()
+        this.showMaterialModal = false
+      },
+      async bjqCheck(){
+        //报警器设备型号校验
+        this.bjqChecklag = [] //初始化
+        if (this.selectdata.f_apply_type === '报警器报建' || this.selectdata.f_apply_type === '工商业报警器报建'){
+          let bjqinfo = {
+            f_material_name : "",
+            f_bjq_sid: ""
+          }
+          for (const bjqinfoElement of this.materials) {
+            bjqinfo.f_bjq_sid = bjqinfoElement.f_bjq_sid
+            bjqinfo.f_material_name = bjqinfoElement.f_material_name
+            if (bjqinfo.f_material_name.substr(0,3) === '报警器'){
+              let http = new HttpResetClass()
+              let res = await http.load(
+                'POST',
+                // `/rs/logic/bjqcheck`,
+                `ncc/rs/logic/bjqcheck`,
+                bjqinfo
+              )
+              if (res.data.code != 200){
+                this.bjqChecklag.push(res.data.code)
+                // this.$showMessage(res.data.msg)
+                Vue.showAlert(res.data.msg, 'danger', 6000)
+                return
+              }
+            }
+          }
+        }
+      }
+    },
+    events: {
+      'beforeFileUpload' (file) {
+        this.showWork = true
+      },
+      async 'onFileUpload'(file, result) {
+        let data = {
+          selectdata: this.selectdata,
+          filepath: result.f_downloadpath,
+          user: this.$login.f
+        }
+        try {
+          let res = await this.$resetpost(`rs/logic/importMaterial`, {data: data}, {
+            resolveMsg: null,
+            rejectMsg: '导入失败！！！',
+            silent: true
+          }, 0)
+        } catch (e) {
+          this.closeFile()
+        }
+        this.$dispatch('breakControl', this.selectdata)
+      }
+    },
+  }
+
+</script>
+
+<style scoped>
+
+</style>

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

@@ -23,6 +23,7 @@
             <th class="textNoLineBreak">证件类型</th>
             <th class="textNoLineBreak">证件号码</th>
             <th class="textNoLineBreak">时间</th>
+            <th class="textNoLineBreak">备注</th>
             <th class="textNoLineBreak">
               <button type="button" class="btn btn-info head-but"
                       :disabled="$parent.$parent.$parent.mark === 1"
@@ -73,6 +74,9 @@
             <td style="text-align: center;">
               <nobr>{{row.f_create_date}}</nobr>
             </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_userinfo_comments}}</nobr>
+            </td>
             <td style="text-align: center;">
               <nobr>