apply-clients 3.3.79 → 3.3.84

package/src/components/product/Onetomany.vue

@@ -209,12 +209,54 @@ export default {
   ready () {
   },
   methods: {
-    confirmModal () {
+    async confirmModal () {
       if (this.modelTitle === '新增') {
-        if (this.onetomany.add.event) {
-          this.$dispatch(this.onetomany.add.event, this.index)
-        } else {
-          this.$dispatch('onetomanyadd', this.index)
+        //报警器设备型号校验
+        if (this.modelTitle === '新增' && this.selectdata.f_apply_type === '报警器报建'){
+          let data = {
+            f_material_name : "",
+            f_bjq_sid: "",
+          }
+          this.onetomany.fields.forEach(item=>{
+            if (item.label === '材料编号'){
+              data.f_bjq_sid = item.value
+            }
+            if (item.label === '材料名称'){
+              data.f_material_name = item.value
+            }
+          })
+          if (data.f_material_name.substr(0,3) === '报警器'){
+            let res = await this.$resetpost(
+              `ncc/rs/logic/bjqcheck`,
+              // `/rs/logic/bjqcheck`,
+              data
+            )
+            if (res.data.code == 200){
+              if (this.onetomany.add.event) {
+                this.$dispatch(this.onetomany.add.event, this.index)
+              } else {
+                this.$dispatch('onetomanyadd', this.index)
+              }
+              this.closeModal()
+            }else {
+              this.disableButton = true
+              this.$showMessage(res.data.msg)
+            }
+          }else {
+            if (this.onetomany.add.event) {
+              this.$dispatch(this.onetomany.add.event, this.index)
+            } else {
+              this.$dispatch('onetomanyadd', this.index)
+            }
+            this.closeModal()
+          }
+        }else {
+          if (this.onetomany.add.event) {
+            this.$dispatch(this.onetomany.add.event, this.index)
+          } else {
+            this.$dispatch('onetomanyadd', this.index)
+          }
+          this.closeModal()
         }
       }
       if (this.modelTitle === '修改') {
@@ -223,9 +265,9 @@ export default {
         } else {
           this.$dispatch('onetomanyupdate', this.index, this.rowIndex)
         }
+        this.closeModal()
       }
-
-      this.closeModal()
+      // this.closeModal()
     },
     onchange (fieldIndex) {
       this.disableModalButton()

package/src/components/product/Print/BuildOrder/buildOrderList.vue

@@ -18,7 +18,7 @@
                 <label class="font_normal_body">工程编号：</label>
                 <input type="text" style="width: 60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
                        v-on:keyup.enter="$parent.$parent.search()"
-                       condition="f_apply_num = '{}'">
+                       condition="u.f_apply_num = '{}'">
               </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">客户名称：</label>
@@ -96,13 +96,13 @@
           </template>
           <template partial='body'>
             <tr >
-              <td style="text-align: center;">
+              <td v-if="row.f_back_reason ? showRow: !showRow" style="text-align: center;">
                 <nobr><font>{{$index+1}}</font></nobr>
               </td>
               <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
                 <nobr><font>{{row.f_apply_num}}</font></nobr>
               </td>
-              <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
+              <td v-if="row.f_back_reason ? showRow: !showRow" style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
                 <nobr><font>{{row.f_user_name}}</font></nobr>
               </td>
               <td style="text-align: center;" @click="$parent.$parent.$parent.click(row)">
@@ -167,7 +167,8 @@ export default {
       showPrint: false,
       showProgress: false,
       percent: 0,
-      type: 'PREVIEW'
+      type: 'PREVIEW',
+      showRow:false
     }
   },
   ready () {
@@ -213,6 +214,8 @@ export default {
       this.selectdata = null
     },
     async click (row) {
+      console.log("词条数据",row)
+
       this.type = 'PREVIEW'
 
       await this.getData(row)
@@ -233,6 +236,7 @@ export default {
       })
 
       this.selectdata = res.data[0]
+      console.log("打印数据 ",this.selectdata)
     },
     clear () {
       Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {

package/src/components/product/Print/BuildOrder/printBuildOrder.vue

@@ -73,6 +73,10 @@
         <td>备&emsp;&emsp;注</td>
         <td colspan="5">{{ selectdata.f_construction_remarks }}</td>
       </tr>
+      <tr>
+        <td>报建备注</td>
+        <td colspan="5">{{ selectdata.f_apply_remarks }}</td>
+      </tr>
     </table>
   </div>
 

package/src/components/product/Process/ExplorationSelect.vue

@@ -4,6 +4,11 @@
       <criteria partial='criteria' @condition-changed='search' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
             <div class="row">
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户名称：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                       v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
+              </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">组织机构：</label>
                 <res-select
@@ -13,12 +18,12 @@
                   is-mul="false"
                 ></res-select>
               </div>
-              <div class="form-group col-sm-3">
-                <label class="font_normal_body">工程编号：</label>
-                <input type="text" style="width:60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
-                       v-on:keyup.enter="$parent.$parent.search()"
-                       condition="u.f_apply_num = '{}'">
-              </div>
+<!--              <div class="form-group col-sm-3">-->
+<!--                <label class="font_normal_body">工程编号：</label>-->
+<!--                <input type="text" style="width:60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"-->
+<!--                       v-on:keyup.enter="$parent.$parent.search()"-->
+<!--                       condition="u.f_apply_num = '{}'">-->
+<!--              </div>-->
               <div class="form-group col-sm-3 button-range">
                 <a type="button" class="button_new button_spacing" v-if="$parent.$parent.projectStart"
                    href="/apply/download/excel/散户报装模板.xlsx" download>模板下载</a>
@@ -40,10 +45,16 @@
               </div>
             </div>
             <div class="row" v-show="$parent.$parent.criteriaShow">
+<!--              <div class="form-group col-sm-3">-->
+<!--                <label class="font_normal_body">客户名称：</label>-->
+<!--                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"-->
+<!--                       v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>-->
+<!--              </div>-->
               <div class="form-group col-sm-3">
-                <label class="font_normal_body">客户名称：</label>
-                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                       v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
+                <label class="font_normal_body">工程编号：</label>
+                <input type="text" style="width:60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="u.f_apply_num = '{}'">
               </div>
               <div class="form-group col-sm-3">
                 <label class="font_normal_body">联系电话：</label>
@@ -160,41 +171,41 @@
           </tr>
         </template>
         <template partial='body'>
-          <tr >
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+          <tr class="back-style">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':'', row.f_back_reason ? 'back-style':'' ]" 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.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <nobr><font>{{row.f_user_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.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <nobr><font>{{row.f_contract_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.f_back_reason ? 'back-style':'' ]" 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.f_back_reason ? 'back-style':'' ]" 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.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <nobr><font>{{row.f_apply_source}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" 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.f_back_reason ? 'back-style':'' ]" 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.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <nobr><font>{{row.f_sub_state}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" style="text-align: center;">
               <nobr><font>{{row.f_apply_date}}</font></nobr>
             </td>
-            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  ]" style="text-align: center;">
+            <td :class="[ row.isover ==='过期' ? 'p1' : row.isbeforeover === '预期提醒'? 'p':''  , row.f_back_reason ? 'back-style':'' ]" 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>
@@ -449,7 +460,9 @@ import {HttpResetClass, PagedList} from 'vue-client'
   }
 </script>
 <style scoped>
-
+  .back-style{
+    background-color: #ffa726;
+  }
   .p1 {
     color: #dc0b12;
     font-weight:bold

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

@@ -1208,12 +1208,74 @@ export default {
       this.show_data.start_activity = this.$workflow_vue.start_activity
       this.show_data.xmlfilename = this.$workflow_vue.workflow_xmlfilename
 
+      if (this.show_data.f_apply_type === '报警器报建' && this.show_data.defname === '工程施工' && this.show_data.f_sub_state !='完工'){
+        //判断是否添加报警器材料
+        let bjqlag = false
+        let datatemp = {
+          'bjqid':"",
+          'fprocessid':"",
+          'sqvalue':"",
+          'f_bjq_sid':"",
+          'f_material_code':""
+        }
+        let numOne = [];
+        this.show_data.onetomany.forEach(item=>{
+          item.rows.forEach(i=>{
+            if (i.f_material_name.substr(0,3) === '报警器'){
+              bjqlag = true
+              datatemp.bjqid = i.id
+              datatemp.fprocessid = i.f_process_id
+              datatemp.f_bjq_sid = i.f_bjq_sid
+              datatemp.f_material_code = i.f_material_code
+              numOne.push(i.f_bjq_sid)
+            }
+          })
+        })
+        if (!bjqlag){
+          this.$showMessage('请添加报警器物料信息!!!')
+          return
+        }
+        if (numOne.length > 1){
+          this.$showMessage("暂时支持单个报警器物料安装!!!")
+          return
+        }
+        datatemp.sqvalue = this.show_data.areaData.sqvalue
+        //区域地址存入材料记录表
+        let areares = await this.$resetpost(
+          `rs/logic/saveArea`,
+          {data: datatemp},
+          {resolveMsg: null, rejectMsg: '区域地址保存失败'}
+        )
+
+        //完工之后推送数据到汉威
+        let adddata = {
+          f_bjq_sid : datatemp.f_bjq_sid,
+          f_material_code : datatemp.f_material_code,
+          f_bjq_address: this.show_data.areaData.sqvalue,
+          f_user_name: this.show_data.f_user_name,
+          f_address: this.show_data.f_address,
+          f_user_phone: this.show_data.f_phone,
+          f_userinfo_code: this.show_data.f_userinfo_code,
+          installtime: this.show_data.f_construction_date,
+        }
+        let res = await this.$resetpost(
+          `ncc/rs/logic/bjqadduser`,
+          // `rs/logic/bjqadduser`,
+          adddata
+        )
+        if (res.data.code != 200){
+          this.$showMessage(res.data.msg)
+          return
+        }
+      }
+
       let res = await this.$resetpost(
         `rs/logic/ApplyProductService`,
         {data: this.show_data},
         {resolveMsg: null, rejectMsg: '数据保存失败'}
       )
 
+
       if (this.show_data.button.after) {
         this[this.show_data.button.after]()
       }