apply-clients 3.4.3 → 3.4.4

package/src/components/product/OldApply/OldApplyMessage.vue

@@ -0,0 +1,420 @@
+<template>
+  <div class="select-overspread" style="background-color: #ffffff;padding: 20px;overflow: scroll">
+    <form class="form-horizontal">
+      <div class="form-group">
+        <div class="col-sm-4 form-group">
+          <label class="control-label-justify control-label col-sm-6">用户编号</label>
+          <div class="col-sm-6">
+            <input class="form-control input_view" type="input" readonly
+                   v-model="selectdata.f_userinfo_code"
+                   :value="selectdata.f_userinfo_code"/>
+          </div>
+        </div>
+        <div class="col-sm-4 form-group">
+          <label class="control-label-justify control-label col-sm-6">工程编号</label>
+          <div class="col-sm-6">
+            <input class="form-control input_view" type="input" readonly
+                   v-model="selectdata.f_apply_num"
+                   :value="selectdata.f_apply_num"/>
+          </div>
+        </div>
+        <div class="col-sm-4 form-group">
+          <label class="control-label-justify control-label col-sm-6">报建类型</label>
+          <div class="col-sm-6">
+            <input class="form-control input_view" type="input" readonly
+                   v-model="selectdata.f_apply_type"
+                   :value="selectdata.f_apply_type"/>
+          </div>
+        </div>
+        <div class="col-sm-4 form-group">
+          <label class="control-label-justify control-label col-sm-6">流程状态</label>
+          <div class="col-sm-6">
+            <input class="form-control input_view" type="input" readonly
+                   v-model="selectdata.f_sub_state"
+                   :value="selectdata.f_sub_state"/>
+          </div>
+        </div>
+        <div class="col-sm-4 form-group">
+          <label class="control-label-justify control-label col-sm-6">单位名称</label>
+          <div class="col-sm-6">
+            <input class="form-control input_view" type="input" readonly
+                   v-model="selectdata.f_user_name"
+                   :value="selectdata.f_user_name"/>
+          </div>
+        </div>
+        <div class="col-sm-4 form-group">
+          <label class="control-label-justify control-label col-sm-6">联系人</label>
+          <div class="col-sm-6">
+            <input class="form-control input_view" type="input" readonly
+                   v-model="selectdata.f_contact"
+                   :value="selectdata.f_contact"/>
+          </div>
+        </div>
+        <div class="col-sm-4 form-group">
+          <label class="control-label-justify control-label col-sm-6">电话</label>
+          <div class="col-sm-6">
+            <input class="form-control input_view" type="input" readonly
+                   v-model="selectdata.f_phone"
+                   :value="selectdata.f_phone"/>
+          </div>
+        </div>
+        <div class="col-sm-4 form-group">
+          <label class="control-label-justify control-label col-sm-6">身份证号</label>
+          <div class="col-sm-6">
+            <input class="form-control input_view" type="input" readonly
+                   v-model="selectdata.f_idnumber"
+                   :value="selectdata.f_idnumber"/>
+          </div>
+        </div>
+        <div class="col-sm-4 form-group">
+          <label class="control-label-justify control-label col-sm-6">用气性质</label>
+          <div class="col-sm-6">
+            <input class="form-control input_view" type="input" readonly
+                   v-model="selectdata.f_gas_nature"
+                   :value="selectdata.f_gas_nature"/>
+          </div>
+        </div>
+        <div class="col-sm-4 form-group">
+          <label class="control-label-justify control-label col-sm-6">报建接收时间</label>
+          <div class="col-sm-6">
+            <input class="form-control input_view" type="input" readonly
+                   v-model="selectdata.f_apply_date"
+                   :value="selectdata.f_apply_date"/>
+          </div>
+        </div>
+        <div class="col-sm-4 form-group">
+          <label class="control-label-justify control-label col-sm-6">报建审核日期</label>
+          <div class="col-sm-6">
+            <input class="form-control input_view" type="input" readonly
+                   v-model="selectdata.f_apply_check_date"
+                   :value="selectdata.f_apply_check_date"/>
+          </div>
+        </div>
+        <div class="col-sm-4 form-group">
+          <label class="control-label-justify control-label col-sm-6">合同价格</label>
+          <div class="col-sm-6">
+            <input class="form-control input_view" type="input" readonly
+                   v-model="selectdata.f_contract_money"
+                   :value="selectdata.f_contract_money"/>
+          </div>
+        </div>
+        <div class="col-sm-12 form-group">
+          <label class="control-label-justify control-label col-sm-6">收费项目</label>
+          <div class="col-sm-10">
+            <input class="form-control input_view" type="input" readonly
+                   v-model="selectdata.f_payment_term"
+                   :value="selectdata.f_payment_term"/>
+          </div>
+        </div>
+        <div class="col-sm-12 form-group">
+          <label class="control-label-justify control-label col-sm-6">集收单位</label>
+          <div class="col-sm-10">
+            <input class="form-control input_view" type="input" readonly
+                   v-model="selectdata.f_unit_name"
+                   :value="selectdata.f_unit_name"/>
+          </div>
+        </div>
+        <div class="col-sm-12 form-group">
+          <label class="control-label-justify control-label col-sm-6">地址</label>
+          <div class="col-sm-10">
+            <input class="form-control input_view" type="input" readonly
+                   v-model="selectdata.f_address"
+                   :value="selectdata.f_address"/>
+          </div>
+        </div>
+        <div class="col-sm-12 form-group">
+          <label class="control-label-justify control-label col-sm-6">报建备注</label>
+          <div class="col-sm-10">
+            <input class="form-control input_view" type="input" readonly
+                   v-model="selectdata.f_apply_remarks"
+                   :value="selectdata.f_apply_remarks"/>
+          </div>
+        </div>
+
+        <!-- 待安装 -->
+        <div class="col-sm-4 form-group">
+          <label class="control-label-justify control-label col-sm-6">施工项目部</label>
+          <div class="col-sm-6">
+            <input class="form-control input_view" type="input"
+                   :readonly="selectdata.f_sub_state !== '待安装' || type === 'monitor'"
+                   v-model="selectdata.f_construction_unit"
+                   :value="selectdata.f_construction_unit"/>
+          </div>
+        </div>
+        <div class="col-sm-4 form-group">
+          <label class="control-label-justify control-label col-sm-6">施工负责人</label>
+          <div class="col-sm-6">
+            <input class="form-control input_view" type="input"
+                   :readonly="selectdata.f_sub_state !== '待安装' || type === 'monitor'"
+                   v-model="selectdata.f_construction_worker"
+                   :value="selectdata.f_construction_worker"/>
+          </div>
+        </div>
+        <div class="col-sm-4 form-group">
+          <label class="control-label-justify control-label col-sm-6">施工完成时间</label>
+          <div class="col-sm-6">
+            <datepicker
+              :value.sync="selectdata.f_completion_time"
+              v-model="selectdata.f_completion_time"
+              :readonly="selectdata.f_sub_state !== '待安装' || type === 'monitor'"
+              :disabled="selectdata.f_sub_state !== '待安装' || type === 'monitor'"
+              :show-reset-button="true"
+            ></datepicker>
+          </div>
+        </div>
+        <div class="col-sm-4 form-group">
+          <label class="control-label-justify control-label col-sm-6">表号</label>
+          <div class="col-sm-6">
+            <input class="form-control input_view" type="input"
+                   :readonly="selectdata.f_sub_state !== '待安装' || type === 'monitor'"
+                   v-model="selectdata.f_meternumber"
+                   :value="selectdata.f_meternumber"/>
+          </div>
+        </div>
+        <div class="col-sm-4 form-group">
+          <label class="control-label-justify control-label col-sm-6">防盗卡号</label>
+          <div class="col-sm-6">
+            <input class="form-control input_view" type="input"
+                   :readonly="selectdata.f_sub_state !== '待安装' || type === 'monitor'"
+                   v-model="selectdata.f_card_number"
+                   :value="selectdata.f_card_number"/>
+          </div>
+        </div>
+        <div class="col-sm-4 form-group">
+          <label class="control-label-justify control-label col-sm-6">施工审核时间</label>
+          <div class="col-sm-6">
+            <datepicker
+              :value.sync="selectdata.f_construction_check_time"
+              v-model="selectdata.f_construction_check_time"
+              :readonly="selectdata.f_sub_state !== '待安装' || type === 'monitor'"
+              :disabled="selectdata.f_sub_state !== '待安装' || type === 'monitor'"
+              :show-reset-button="true"
+            ></datepicker>
+          </div>
+        </div>
+
+        <!-- 待点火 -->
+        <template v-if="selectdata.f_sub_state !== '待安装' || type === 'monitor'">
+          <div class="col-sm-4 form-group">
+            <label class="control-label-justify control-label col-sm-6">计划通气时间</label>
+            <div class="col-sm-6">
+              <datepicker
+                :value.sync="selectdata.f_plan_date"
+                v-model="selectdata.f_plan_date"
+                :readonly="type === 'monitor'"
+                :disabled="type === 'monitor'"
+                :show-reset-button="true"
+              ></datepicker>
+            </div>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="control-label-justify control-label col-sm-6">计划气价名称</label>
+            <div class="col-sm-6">
+              <input class="form-control input_view" type="input"
+                     :readonly="type === 'monitor'"
+                     v-model="selectdata.f_gas_price_name"
+                     :value="selectdata.f_gas_price_name"/>
+            </div>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="control-label-justify control-label col-sm-6">计划通气备注</label>
+            <div class="col-sm-6">
+              <input class="form-control input_view" type="input"
+                     :readonly="type === 'monitor'"
+                     v-model="selectdata.f_remark_stask"
+                     :value="selectdata.f_remark_stask"/>
+            </div>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="control-label-justify control-label col-sm-6">通气日期</label>
+            <div class="col-sm-6">
+              <datepicker
+                :value.sync="selectdata.f_ventilate_date"
+                v-model="selectdata.f_ventilate_date"
+                :readonly="type === 'monitor'"
+                :disabled="type === 'monitor'"
+                :show-reset-button="true"
+              ></datepicker>
+            </div>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="control-label-justify control-label col-sm-6">通气备注</label>
+            <div class="col-sm-6">
+              <input class="form-control input_view" type="input"
+                     :readonly="type === 'monitor'"
+                     v-model="selectdata.f_gas_remarks"
+                     :value="selectdata.f_gas_remarks"/>
+            </div>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="control-label-justify control-label col-sm-6">验收人</label>
+            <div class="col-sm-6">
+              <input class="form-control input_view" type="input"
+                     :readonly="type === 'monitor'"
+                     v-model="selectdata.f_acceptor"
+                     :value="selectdata.f_acceptor"/>
+            </div>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="control-label-justify control-label col-sm-6">验收日期</label>
+            <div class="col-sm-6">
+              <datepicker
+                :value.sync="selectdata.f_acceptor_date"
+                v-model="selectdata.f_acceptor_date"
+                :readonly="type === 'monitor'"
+                :disabled="type === 'monitor'"
+                :show-reset-button="true"
+              ></datepicker>
+            </div>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="control-label-justify control-label col-sm-6">验收结果</label>
+            <div class="col-sm-6">
+              <input class="form-control input_view" type="input"
+                     :readonly="type === 'monitor'"
+                     v-model="selectdata.f_acceptance_is_qualified"
+                     :value="selectdata.f_acceptance_is_qualified"/>
+            </div>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="control-label-justify control-label col-sm-6">气价名称</label>
+            <div class="col-sm-6">
+              <input class="form-control input_view" type="input"
+                     :readonly="type === 'monitor'"
+                     v-model="selectdata.f_price_name"
+                     :value="selectdata.f_price_name"/>
+            </div>
+          </div>
+          <div class="col-sm-12 form-group">
+            <label class="control-label-justify control-label col-sm-6">真实流程状态备注：</label>
+            <div class="col-sm-10">
+              <input class="form-control input_view" type="input"
+                     readonly
+                     v-model="selectdata.f_reality_sub_remark"
+                     :value="selectdata.f_reality_sub_remark"/>
+            </div>
+          </div>
+        </template>
+        <template v-if="selectdata.f_sub_state === '终止'">
+          <div class="col-sm-4 form-group">
+            <label class="control-label-justify control-label col-sm-6">终止原因</label>
+            <div class="col-sm-6">
+              <input class="form-control input_view" type="input" readonly
+                     v-model="selectdata.f_stop_reason"
+                     :value="selectdata.f_stop_reason"/>
+            </div>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="control-label-justify control-label col-sm-6">终止人员</label>
+            <div class="col-sm-6">
+              <input class="form-control input_view" type="input" readonly
+                     v-model="selectdata.f_stop_user"
+                     :value="selectdata.f_stop_user"/>
+            </div>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="control-label-justify control-label col-sm-6">终止时间</label>
+            <div class="col-sm-6">
+              <input class="form-control input_view" type="input" readonly
+                     v-model="selectdata.f_stop_date"
+                     :value="selectdata.f_stop_date"/>
+            </div>
+          </div>
+          <div class="col-sm-12 form-group">
+            <label class="control-label-justify control-label col-sm-6">终止备注</label>
+            <div class="col-sm-10">
+              <input class="form-control input_view" type="input" readonly
+                     v-model="selectdata.f_stop_remarks"
+                     :value="selectdata.f_stop_remarks"/>
+            </div>
+          </div>
+        </template>
+      </div>
+    </form>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '报装信息',
+  props: ['selectdata', 'type'],
+  data () {
+    return {
+    }
+  }
+}
+</script>
+<style>
+  .datepicker{
+    width: 100%!important;
+  }
+  .datepicker-input{
+    background-color: #ffffff!important;
+    width: 100%!important;
+  }
+  .datepicker-input:disabled{
+    border: 1px solid #DDD!important;
+    color: #ACA899!important;
+    width: 100%!important;
+  }
+</style>
+<style scoped>
+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;
+  color:#ACA899!important;
+}
+.input_view:disabled{
+  border: 1px solid #DDD!important;
+  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: 100%;
+  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/Onetomany.vue

@@ -25,14 +25,14 @@
                v-if="$parent.$parent.onetomany.import.templateUrl"
                :href="$parent.$parent.onetomany.import.templateUrl" download>模板下载</a>
             <export-excel
-              v-if="!$parent.$parent.onetomany.export.hidden"
-              :data="$parent.$parent.getCondition"
-              :field="$parent.$parent.getField"
-              sqlurl="rs/logic/applyExportfile"
-              :sql-name="$parent.$parent.onetomany.export.sqlName || 'singleTable'"
-              :template-name="$parent.$parent.onetomany.export.templateName || '导出明细'"
-              :btn-name="$parent.$parent.onetomany.export.butName || '导出'"
-              :choose-col="true"></export-excel>
+                          v-if="!$parent.$parent.onetomany.export.hidden"
+                          :data="$parent.$parent.getCondition"
+                          :field="$parent.$parent.getField"
+                          sqlurl="rs/logic/applyExportfile"
+                          :sql-name="$parent.$parent.onetomany.export.sqlName || 'singleTable'"
+                          :template-name="$parent.$parent.onetomany.export.templateName || '导出明细'"
+                          :btn-name="$parent.$parent.onetomany.export.butName || '导出'"
+                          :choose-col="true"></export-excel>
           </th>
         </tr>
       </template>
@@ -209,13 +209,42 @@ export default {
   ready () {
   },
   methods: {
-    confirmModal () {
+    async confirmModal () {
+      //报警器设备型号校验
+      if (this.selectdata.f_apply_type === '报警器报建' || 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){
+            this.disableButton = true
+            this.$showMessage(res.data.msg)
+            return
+          }
+        }
+      }
+
       if (this.modelTitle === '新增') {
         if (this.onetomany.add.event) {
           this.$dispatch(this.onetomany.add.event, this.index)
         } else {
           this.$dispatch('onetomanyadd', this.index)
         }
+        this.closeModal()
       }
       if (this.modelTitle === '修改') {
         if (this.onetomany.update.event) {
@@ -223,9 +252,9 @@ export default {
         } else {
           this.$dispatch('onetomanyupdate', this.index, this.rowIndex)
         }
+        this.closeModal()
       }
-
-      this.closeModal()
+      // this.closeModal()
     },
     onchange (fieldIndex) {
       this.disableModalButton()