apply-clients 3.3.110-204 → 3.3.110-207

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.3.110-204",
+  "version": "3.3.110-207",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/apply.js

@@ -64,6 +64,8 @@ export default function () {
   Vue.component('select-apply', (resolve) => { require(['./components/product/Process/Processes/selectApply'], resolve) })
   // 设备管理
   Vue.component('apply-devices-management', (resolve) => { require(['./components/product/Process/Processes/devicesManagement'], resolve) })
+  // 添加多个材料合并
+  Vue.component('add-material-science', (resolve) => { require(['./components/product/Process/Processes/addMaterialScience'], resolve) })
   Vue.component('test', (resolve) => { require(['./components/product/Test'], resolve) })
 
   /** VueUtils **/

package/src/applyAndroid.js

@@ -22,6 +22,8 @@ export default function () {
   Vue.component('app-service-view', (resolve) => { require(['./components/android/AppServiceView'], resolve) })
   Vue.component('app-onetomany', (resolve) => { require(['./components/android/AppOnetomany'], resolve) })
 
+  Vue.component('app-add-material-science', (resolve) => { require(['./components/android/Process/Processes/AppAddMaterialScience'], resolve) })
+
   Vue.component('app-installation-details', (resolve) => { require(['./components/android/Process/Processes/AppInstallationDetails'], resolve) })
   Vue.component('app-apply-devices-management', (resolve) => { require(['./components/android/Process/Processes/AppDevicesManagement'], resolve) })
   Vue.component('app-charge-management', (resolve) => { require(['./components/android/Process/Processes/AppChargeManagement'], resolve) })

package/src/components/android/Process/AppServiceControl.vue

@@ -192,7 +192,71 @@ export default {
         this[this.show_data.button.after]()
       }
       // 返回上层
-      this.$dispatch('confirm')
+      if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '报装申请' && this.show_data.button.button_name === '合同'){
+        let data = {
+          tablename: 't_apply',
+          condition: `f_process_id='${this.show_data.f_process_id}'`
+        }
+        let http = new HttpResetClass()
+        let restp = await http.load(
+          'POST',
+          `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
+        )
+        restp.data[0].processname = '散户报建流程'
+        restp.data[0].defname = '合同签订'
+        this.$dispatch('gotoson',restp.data[0])
+        this.$goto('app-service-control', {selectdata: restp.data[0]}, 'self', restp.data[0])
+        // this.$dispatch('apply',restp.data[0])
+
+      } else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '合同签订' && this.show_data.button.button_name === '提交'){
+        let data2 = {
+          condition: `u.id = ${this.show_data.id}`,
+          data: {
+            id: Vue.user.id,
+            orgid: Vue.user.orgid
+          }
+        }
+        let http = new HttpResetClass()
+        let restp1 = await http.load(
+          'POST',
+          `${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`,
+          {data: data2},
+          {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
+        )
+        console.log('打印查询的内容',restp1)
+        restp1.data[0].processname = '散户报建流程'
+        restp1.data[0].defname = '报装缴费'
+        this.$dispatch('gotoson',restp1.data[0])
+        this.$goto('app-service-control', {selectdata: restp1.data[0]}, 'self',restp1.data[0])
+      }else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '报装缴费' && this.show_data.button.button_name === '提交'){
+        let data3 = {
+          condition: `u.id = ${this.show_data.id}`,
+          data: {
+            id: Vue.user.id,
+            orgid: Vue.user.orgid
+          }
+        }
+        let http = new HttpResetClass()
+        let restp2 = await http.load(
+          'POST',
+          `${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`,
+          {data: data3},
+          {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
+        )
+        console.log('打印查询的内容',restp2)
+        restp2.data[0].processname = '散户报建流程'
+        restp2.data[0].defname  = '工程派工'
+        this.$dispatch('gotoson',restp2.data[0])
+        this.$goto('app-service-control', {selectdata: restp2.data[0]}, 'self',restp2.data[0])
+      }
+      else{
+        // console.log('-----')
+        this.$dispatch('confirm')
+      }
+
+
     },
     async refurbish() {
       let data = {
@@ -493,6 +557,34 @@ export default {
         }
       }
     },
+    hideLabels(...labels) {
+      for (const item of this.show_data.fields) {
+        if (labels.includes(item.label)) {
+          item.hidden = true
+        }
+      }
+    },
+    requiredLabels(...labels) {
+      for (const item of this.show_data.fields) {
+        if (labels.includes(item.label)) {
+          item.required = true
+        }
+      }
+    },
+    electiveLabels(...labels) {
+      for (const item of this.show_data.fields) {
+        if (labels.includes(item.label)) {
+          item.required = false
+        }
+      }
+    },
+    showLabels(...labels) {
+      for (const item of this.show_data.fields) {
+        if (labels.includes(item.label)) {
+          item.hidden = false
+        }
+      }
+    },
     setLabelValue(label, value) {
       for (const item of this.show_data.fields) {
         if (item.label === label) {

package/src/components/android/Process/Processes/AppAddMaterialScience.vue

@@ -0,0 +1,331 @@
+<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">
+            <button class="button_new button_spacing" type="button" @click="$parent.$parent.openMaterialModal()">添加</button>
+          </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;">
+            <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="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>
+
+      </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'
+  export default {
+    name: 'addMaterialScience',
+    props: {
+      selectdata: {
+        type: Object
+      }
+    },
+    data () {
+      return {
+        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:''
+          }
+        ],
+        meterialOptions:[],
+        row:{}
+      }
+    },
+    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:''
+          }
+        ],
+          this.showMaterialModal = true
+      },
+      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:''
+        })
+      },
+      // 获取模态框材料
+      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_price}`,
+            '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
+      },
+      // 新增材料
+      async addMaterial () {
+        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.f_orgids,
+          f_orgname: this.$login.f.f_fengongsi,
+          materials:this.materials
+        }
+        let res = await this.$resetpost(
+          `rs/logic/saveMaterials`,
+          data
+        )
+        this.closeMaterials()
+      },
+      deleteMaterial (row) {
+        this.$showMessage('您确定要删除这条记录吗？',['confirm']).then(res =>{
+          if (res === 'confirm'){
+            let http = new HttpResetClass()
+
+            let res = http.load(
+              'DELETE',
+              `rs/entity/t_material_apply/${row.id}`,
+              null,
+              {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
+          }
+        ]
+        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
+        let res = await this.$resetpost(
+          `rs/entity/t_material_apply`,
+          data
+        )
+        this.closeMaterials()
+      },
+      closeMaterials () {
+        this.getOnetoManyData()
+        this.showMaterialModal = false
+      }
+    }
+  }
+
+</script>
+
+<style scoped>
+
+</style>

package/src/components/product/OldApply/Handle/HandleApply.vue

@@ -154,6 +154,9 @@
               <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>
             </tr>
           </template>
@@ -204,6 +207,13 @@
               <td style="text-align: center;">
                 <nobr><font>{{row.f_userinfo_code}}</font></nobr>
               </td>
+
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_reality_sub_date}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_reality_sub_user}}</font></nobr>
+              </td>
               <td style="text-align: center;">
                 <dropdown>
                   <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">
@@ -211,9 +221,9 @@
                   </button>
                   <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
                     <li>
-                      <a href="#" v-if="this.$login.f.rolesnames.indexOf('工程部派工') !== -1 || this.$login.f.rolesnames.indexOf('运营部派工') !== -1 || (this.$login.f.rolesnames.indexOf('营业厅报装') !== -1 && row.f_sub_state === '待点火')" @click="$parent.$parent.$parent.click(row)">{{row.f_sub_state}}</a>
-                      <a href="#" v-if="this.$login.f.rolesnames.indexOf('营业厅报装') !== -1 || this.$login.f.rolesnames.indexOf('运营部派工') !== -1" @click="$parent.$parent.$parent.stopApply(row)">异常终止</a>
-                      <a href="#" v-if="this.$login.f.rolesnames.indexOf('营业厅报装') !== -1 || this.$login.f.rolesnames.indexOf('运营部派工') !== -1" @click="$parent.$parent.$parent.reviseApply(row)">修改真实流程状态</a>
+                      <a href="#" v-if="row.f_sub_state !== '完工' && (this.$login.f.rolesnames.indexOf('工程部派工') !== -1 || this.$login.f.rolesnames.indexOf('运营部派工') !== -1 || (this.$login.f.rolesnames.indexOf('营业厅报装') !== -1 && row.f_sub_state === '待点火'))" @click="$parent.$parent.$parent.click(row)">{{row.f_sub_state}}</a>
+                      <a href="#" v-if="row.f_sub_state !== '完工' && (this.$login.f.rolesnames.indexOf('营业厅报装') !== -1 || this.$login.f.rolesnames.indexOf('运营部派工') !== -1)" @click="$parent.$parent.$parent.stopApply(row)">异常终止</a>
+                      <a href="#" v-if="row.f_sub_state === '完工' && (this.$login.f.rolesnames.indexOf('营业厅报装') !== -1 || this.$login.f.rolesnames.indexOf('运营部派工') !== -1)" @click="$parent.$parent.$parent.reviseApply(row)">修改真实流程状态</a>
                     </li>
                   </ul>
                 </dropdown>
@@ -279,13 +289,13 @@ export default {
       args.condition = args.condition + ` and f_orgid = '${this.curorgid[0]}'`
 
       if (this.$login.f.rolesnames.indexOf('工程部派工') !== -1 && this.$login.f.rolesnames.indexOf('运营部派工') !== -1) {
-        args.condition = args.condition + ` and (f_sub_state = '待安装' or f_sub_state = '待点火')`
+        args.condition = args.condition + ` and (f_sub_state = '待安装' or f_sub_state = '待点火' or f_sub_state = '完工')`
       } else if (this.$login.f.rolesnames.indexOf('工程部派工') !== -1) {
-        args.condition = args.condition + ` and f_sub_state = '待安装'`
+        args.condition = args.condition + ` and (f_sub_state = '待安装' or f_sub_state = '完工')`
       } else if (this.$login.f.rolesnames.indexOf('运营部派工') !== -1) {
-        args.condition = args.condition + ` and f_sub_state = '待点火'`
+        args.condition = args.condition + ` and (f_sub_state = '待点火' or f_sub_state = '完工')`
       } else {
-        args.condition = args.condition + ` and (f_sub_state = '待安装' or f_sub_state = '待点火')`
+        args.condition = args.condition + ` and (f_sub_state = '待安装' or f_sub_state = '待点火' or f_sub_state = '完工')`
       }
 
       this.model.search(args.condition, args.model)

package/src/components/product/OldApply/Monitor/MonitorApply.vue

@@ -171,6 +171,9 @@
               <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>
             </tr>
           </template>
           <template partial='body'>
@@ -220,6 +223,14 @@
               <td @click="$parent.$parent.$parent.click(row)" style="text-align: center;">
                 <nobr><font>{{row.f_userinfo_code}}</font></nobr>
               </td>
+
+
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_reality_sub_date}}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{row.f_reality_sub_user}}</font></nobr>
+              </td>
             </tr>
           </template>
         </data-grid>

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

@@ -80,6 +80,17 @@
             close-on-select ></v-select>
         </div>
       </div>
+      <div class="col-sm-12 form-group"  v-if="apply.f_reality_sub_state === '其他'">
+        <label class="control-label-justify control-label col-sm-2" style="line-height: 35px">备注</label>
+        <div class="col-sm-10">
+          <textarea
+            class="form-control input_view"
+            style="width: 100%;height: 100%" rows="2"
+            v-model="apply.f_reality_sub_remark"
+            :value="apply.f_reality_sub_remark"
+          ></textarea>
+        </div>
+      </div>
     </article>
     <footer slot="modal-footer" class="modal-footer">
       <button :class="apply.f_reality_sub_state ? 'btn btn-primary' : 'btn btn-default'"

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

@@ -285,6 +285,15 @@
                      :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">

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

@@ -56,6 +56,12 @@
                        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_contract_money"
+                       v-on:keyup.enter="$parent.$parent.search()"
+                       condition="u.f_contract_money like '%{}%'">
+              </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_phone"
@@ -145,6 +151,18 @@
                   :value-single="true"
                   close-on-select ></v-select>
               </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">是否对账：</label>
+                <v-select
+                  v-model="model.f_no_reconciliation"
+                  placeholder='是否对账'
+                  condition="f_no_reconciliation = '{}'"
+                  :value.sync="model.f_no_reconciliation"
+                  :options='$parent.$parent.reconciliation'
+                  class="select select_list"
+                  :value-single="true"
+                  close-on-select ></v-select>
+              </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.act_sender"
@@ -282,6 +300,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
         showModal: false, // 控制发起类型选择
         applyType: '',  // 报建类型
         curorgid: [this.$login.f.orgid],
+        reconciliation: [{label: '全部', value: ''}, ...this.$appdata.getParam('是否对账')], // 是否合账
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
         defnames: [{label: '全部', value: ''}], // 流程节点
         applyNatures: [{label: '全部', value: ''}], // 报建性质

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

@@ -0,0 +1,331 @@
+<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">
+            <button class="button_new button_spacing" type="button" @click="$parent.$parent.openMaterialModal()">添加</button>
+          </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;">
+            <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="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>
+
+      </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'
+  export default {
+    name: 'addMaterialScience',
+    props: {
+      selectdata: {
+        type: Object
+      }
+    },
+    data () {
+      return {
+        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:''
+          }
+        ],
+        meterialOptions:[],
+        row:{}
+      }
+    },
+    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:''
+          }
+        ],
+        this.showMaterialModal = true
+      },
+      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:''
+        })
+      },
+      // 获取模态框材料
+      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_price}`,
+            '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
+      },
+      // 新增材料
+      async addMaterial () {
+        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.f_orgids,
+          f_orgname: this.$login.f.f_fengongsi,
+          materials:this.materials
+        }
+        let res = await this.$resetpost(
+          `rs/logic/saveMaterials`,
+          data
+        )
+        this.closeMaterials()
+      },
+      deleteMaterial (row) {
+        this.$showMessage('您确定要删除这条记录吗？',['confirm']).then(res =>{
+          if (res === 'confirm'){
+            let http = new HttpResetClass()
+
+            let res = http.load(
+              'DELETE',
+              `rs/entity/t_material_apply/${row.id}`,
+              null,
+              {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
+          }
+        ]
+        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
+        let res = await this.$resetpost(
+          `rs/entity/t_material_apply`,
+          data
+        )
+        this.closeMaterials()
+      },
+      closeMaterials () {
+        this.getOnetoManyData()
+        this.showMaterialModal = false
+      }
+    }
+  }
+
+</script>
+
+<style scoped>
+
+</style>

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

@@ -59,7 +59,6 @@ export default {
       )
       debugger
       this.setLabelOptions('服务人', res.data.map(item => {
-        debugger
         return {
           label: item.name,
           value: item.name
@@ -292,6 +291,10 @@ export default {
       this.$nextTick(() => {
         this.showview = true
       })
+      if ((this.show_data.f_apply_type === '工商户报建' || this.show_data.f_apply_type === '团购报建')
+        && (this.show_data.defname === '合同签订')){
+        this.contract_number()
+      }
     },
     // 金额转大写
     smalltoBIG(n) {
@@ -742,6 +745,107 @@ export default {
       this.$dispatch('loadPage')
 
       throw '终止报建！！！'
+    },
+    async contract_number() {
+     console.log("进入编号合同编号生成",this.$login.f.orgs)
+      let f_contract_number = ''
+      const nowDate = new Date();
+      const date = {
+        year: nowDate.getFullYear(),
+        month: nowDate.getMonth() + 1,
+        day: nowDate.getDate()
+      }
+
+      function upperCaseChars(dir) {
+        let string = '';
+        switch (dir){
+          case '周口市天然气有限公司':
+            string = 'ZK'  // 当表达式的结果等于 房产 时，则执行该代码
+            break;
+          case '项城市天然气有限公司':
+            string = "XC"  // 当表达式的结果等于 自建房 时，则执行该代码
+            break;
+          case '西华县天然气有限公司':
+            string = 'XH'  // 当表达式的结果等于 商业 时，则执行该代码
+            break;
+          case '鹿邑县天然气有限公司':
+            string = 'LY'  // 当表达式的结果等于 工业 时，则执行该代码
+            break;
+          case '郸城县天然气有限公司':
+            string = 'DC'  // 当表达式的结果等于 中压 时，则执行该代码
+            break;
+          default :
+            break;  // 如果没有与表达式相同的值，则执行该代码
+        }
+        return string;
+      }
+
+      const dir = upperCaseChars(this.$login.f.orgs) //分公司
+
+      let type = 0   //类型
+      let entry_type = ''
+      if(this.show_data.f_apply_type === '团购报建') {
+        entry_type = this.show_data.f_apply_nature
+      }else {
+        entry_type = this.show_data.f_entry_type
+      }
+      switch (entry_type){
+        case '城区':
+          type = 1  // 当表达式的结果等于 城区 时，则执行该代码
+          break;
+        case '新农村':
+          type = 2  // 当表达式的结果等于 新农村 时，则执行该代码
+          break;
+        default :
+          break;  // 如果没有与表达式相同的值，则执行该代码
+      }
+
+      let nature = 0    // 性质
+      switch (this.show_data.f_new_entry){
+        case '房产':
+          nature = 1  // 当表达式的结果等于 房产 时，则执行该代码
+          break;
+        case '自建房':
+          nature = 2  // 当表达式的结果等于 自建房 时，则执行该代码
+          break;
+        case '商业':
+          nature = 3  // 当表达式的结果等于 商业 时，则执行该代码
+          break;
+        case '工业':
+          nature = 4  // 当表达式的结果等于 工业 时，则执行该代码
+          break;
+        case '中压':
+          nature = 5  // 当表达式的结果等于 中压 时，则执行该代码
+          break;
+        default :
+          break;  // 如果没有与表达式相同的值，则执行该代码
+      }
+
+      const newMonth = date.month >= 10 ? date.month : '0' + date.month //月份
+      const dataYm = date.year + '-01-01'
+      const newYear = date.year + 1
+      const year = date.year.toString().substring(2,4) //年份
+
+
+
+      let http = new HttpResetClass()
+      let res = await http.load('POST', 'rs/sql/contractCount', {data: {dataYm: dataYm, newYear: newYear, orgid: this.$login.f.orgid}}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
+      if (res.data[0].count === 0) {
+        f_contract_number = dir + type + nature + year + newMonth  + '001'
+        console.log("触发if", f_contract_number)
+      } else {
+        let count = res.data[0].count
+        f_contract_number = dir + type + nature + year + newMonth  + this.PrefixInteger(count, 3)
+        console.log("触发else", f_contract_number)
+      }
+      this.setLabelValue("合同编号", f_contract_number)
+      return f_contract_number
+    },
+    PrefixInteger(num, n) {
+      return (Array(n).join(0) + num).slice(-n);
     }
   },
   events: {
@@ -1392,7 +1496,69 @@ export default {
       if (this.show_data.button.after) {
         this[this.show_data.button.after]()
       }
-      this.$dispatch('loadPage')
+
+      if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '报装申请' && this.show_data.button.button_name === '合同'){
+        let data = {
+          tablename: 't_apply',
+          condition: `f_process_id='${this.show_data.f_process_id}'`
+        }
+        let http = new HttpResetClass()
+        let restp = await http.load(
+          'POST',
+          `rs/sql/singleTable`,
+          {data: data},
+          {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
+        )
+       debugger
+        restp.data[0].processname = '散户报建流程'
+        restp.data[0].defname = '合同签订'
+        this.$dispatch('apply',restp.data[0])
+
+      } else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '合同签订' && this.show_data.button.button_name === '提交'){
+        let data2 = {
+          condition: `u.id = ${this.show_data.id}`,
+          data: {
+            id: this.$login.f.id,
+            orgid: this.$login.f.orgid
+          }
+        }
+        let http = new HttpResetClass()
+        let restp1 = await http.load(
+          'POST',
+          `rs/sql/checkuser`,
+          {data: data2},
+          {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
+        )
+        debugger
+        console.log('有没有发请求打印查询的内容restp1',restp1)
+        // restp1.data[0].processname = '散户报建流程'
+        // restp1.data[0].defname = '报装缴费'
+        this.$dispatch('apply',restp1.data[0])
+      }else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '报装缴费' && this.show_data.button.button_name === '提交'){
+        let data3 = {
+          condition: `u.id = ${this.show_data.id}`,
+          data: {
+            id: this.$login.f.id,
+            orgid: this.$login.f.orgid
+          }
+        }
+        let http = new HttpResetClass()
+        let restp2 = await http.load(
+          'POST',
+          `rs/sql/checkuser`,
+          {data: data3},
+          {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
+        )
+        debugger
+        console.log('打印查询的内容',restp2)
+        // restp2.data[0].processname = '散户报建流程'
+        // restp2.data[0].defname  = '工程派工'
+        this.$dispatch('apply',restp2.data[0])
+      }
+      else{
+          this.$dispatch('loadPage')
+      }
+
     },
     // 失去焦点出触发事件
     'onchange' (index) {

package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue

@@ -256,6 +256,10 @@
         this.$nextTick(() => {
           this.showview = true
         })
+        if ((this.show_data.f_apply_type === '工商户报建' || this.show_data.f_apply_type === '团购报建')
+          && (this.show_data.defname === '合同签订')){
+          this.contract_number()
+        }
       },
       // 金额转大写
       smalltoBIG(n) {
@@ -545,6 +549,101 @@
             value: item.id
           }
         })
+      },
+      async contract_number() {
+        console.log("进入编号合同编号生成",this.$login.f.orgs)
+        let f_contract_number = ''
+        const nowDate = new Date();
+        const date = {
+          year: nowDate.getFullYear(),
+          month: nowDate.getMonth() + 1,
+          day: nowDate.getDate()
+        }
+
+        function upperCaseChars(dir) {
+          let string = '';
+          switch (dir){
+            case '周口市天然气有限公司':
+              string = 'ZK'  // 当表达式的结果等于 房产 时，则执行该代码
+              break;
+            case '项城市天然气有限公司':
+              string = "XC"  // 当表达式的结果等于 自建房 时，则执行该代码
+              break;
+            case '西华县天然气有限公司':
+              string = 'XH'  // 当表达式的结果等于 商业 时，则执行该代码
+              break;
+            case '鹿邑县天然气有限公司':
+              string = 'LY'  // 当表达式的结果等于 工业 时，则执行该代码
+              break;
+            case '郸城县天然气有限公司':
+              string = 'DC'  // 当表达式的结果等于 中压 时，则执行该代码
+              break;
+            default :
+              break;  // 如果没有与表达式相同的值，则执行该代码
+          }
+          return string;
+        }
+
+        const dir = upperCaseChars(this.$login.f.orgs) //分公司
+
+        let type = 0   //类型
+        switch (this.show_data.f_entry_type){
+          case '城区':
+            type = 1  // 当表达式的结果等于 城区 时，则执行该代码
+            break;
+          case '新农村':
+            type = 2  // 当表达式的结果等于 新农村 时，则执行该代码
+            break;
+          default :
+            break;  // 如果没有与表达式相同的值，则执行该代码
+        }
+
+        let nature = 0    // 性质
+        switch (this.show_data.f_new_entry){
+          case '房产':
+            nature = 1  // 当表达式的结果等于 房产 时，则执行该代码
+            break;
+          case '自建房':
+            nature = 2  // 当表达式的结果等于 自建房 时，则执行该代码
+            break;
+          case '商业':
+            nature = 3  // 当表达式的结果等于 商业 时，则执行该代码
+            break;
+          case '工业':
+            nature = 4  // 当表达式的结果等于 工业 时，则执行该代码
+            break;
+          case '中压':
+            nature = 5  // 当表达式的结果等于 中压 时，则执行该代码
+            break;
+          default :
+            break;  // 如果没有与表达式相同的值，则执行该代码
+        }
+
+        const newMonth = date.month >= 10 ? date.month : '0' + date.month //月份
+        const dataYm = date.year + '-01-01'
+        const newYear = date.year + 1
+        const year = date.year.toString().substring(2,4) //年份
+
+
+
+        let http = new HttpResetClass()
+        let res = await http.load('POST', 'rs/sql/contractCount', {data: {dataYm: dataYm, newYear: newYear, orgid: this.$login.f.orgid}}, {
+          resolveMsg: null,
+          rejectMsg: null
+        })
+        if (res.data[0].count === 0) {
+          f_contract_number = dir + type + nature + year + newMonth  + '001'
+          console.log("触发if", f_contract_number)
+        } else {
+          let count = res.data[0].count
+          f_contract_number = dir + type + nature + year + newMonth  + this.PrefixInteger(count, 3)
+          console.log("触发else", f_contract_number)
+        }
+        this.setLabelValue("合同编号", f_contract_number)
+        return f_contract_number
+      },
+      PrefixInteger(num, n) {
+        return (Array(n).join(0) + num).slice(-n);
       }
     },
     events:{

package/src/components/product/Supervisory/SupervisoryList.vue

@@ -54,6 +54,12 @@
                      v-on:keyup.enter="search"
                      condition="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_contract_money"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="f_contract_money like '%{}%'">
+            </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_phone"

package/src/components/product/VueUtils/ApplyUpload.vue

@@ -143,7 +143,7 @@ export default {
     // 查询
     async load() {
       let condition = ''
-      if(this.businessid){
+      if(!isEmpty(this.businessid)){
         condition = `f_businessid= '${this.headers.businessid}' `
       }else{
         condition = `f_blobid= '${this.headers.blodid}' `

package/src/main.js

@@ -7,7 +7,7 @@ import {sale} from 'sale-client'
 import {material} from 'material-client'
 
 import apply from './apply'
-
+//
 // import applyAndroid from './applyAndroid'
 
 all()