apply-clients 7.1.36-yuchuan-2 → 7.1.36-yuchuan-3

package/src/components/android/Task/GuanXianJianShe/AppGuanXianCaiLiao.vue

@@ -0,0 +1,237 @@
+<template>
+  <div class="col-sm-12" style="margin: 20px 0px;">
+    <data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
+      <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
+              type="button"
+              class="btn btn-info head-but"
+              @click="$parent.$parent.showGuanXianModal()"
+              :disabled="$parent.$parent.mark===1"
+            >新增线路</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_branch_trunk}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_pipe_diameter}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_pipe_material}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_starting_point}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_end_point}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_pipe_length}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>
+              <button
+                type="button"
+                name="button"
+                class="btn btn-link"
+                @click="$parent.$parent.showGuanXianModal(row)"
+                :disabled="$parent.$parent.mark===1"
+              >修改</button>
+
+              <button
+                type="button" name="button" class="btn btn-link"
+                @click="$parent.$parent.deleteXianLu(row)"
+                :disabled="$parent.$parent.mark===1"
+              >删除</button>
+
+            </nobr>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+
+    <validator name="v">
+      <modal v-if="showGuanXian" :show.sync="showGuanXian" v-ref:modal :large="true" :backdrop="false" title="管线明细">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
+          <h4 class="modal-title">管线明细</h4>
+        </header>
+        <article slot="modal-body" class="modal-body clearfix">
+          <div class="form-group col-sm-6" :class="[$v.f_branch_trunk.required ? 'has-error' : '']">
+            <label class="col-sm-4 control-label">支干线：</label>
+            <div class="col-sm-8">
+              <input type="text" v-show="false" v-model="guanXian.f_branch_trunk" v-validate:f_payment_method = "['required']" >
+              <input-select
+                placeholder='请选择' width="100%"
+                v-model="guanXian.f_branch_trunk"
+                :value.sync="guanXian.f_branch_trunk"
+                :options='branchTrunks'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></input-select>
+            </div>
+          </div>
+          <div class="form-group col-sm-6" :class="[$v.f_pipe_diameter.required ? 'has-error' : '']">
+            <label class="col-sm-4 control-label">管径：</label>
+            <div class="col-sm-8">
+              <input type="text" v-show="false" v-model="guanXian.f_pipe_diameter" v-validate:f_payment_method = "['required']" >
+              <input-select
+                placeholder='请选择' width="100%"
+                v-model="guanXian.f_pipe_diameter"
+                :value.sync="guanXian.f_pipe_diameter"
+                :options='pipeDiameters'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></input-select>
+            </div>
+          </div>
+          <div class="form-group col-sm-6" :class="[$v.f_pipe_material.required ? 'has-error' : '']">
+            <label class="col-sm-4 control-label">管材：</label>
+            <div class="col-sm-8">
+              <input type="text" v-show="false" v-model="guanXian.f_pipe_material" v-validate:f_payment_method = "['required']" >
+              <input-select
+                placeholder='请选择' width="100%"
+                v-model="guanXian.f_pipe_material"
+                :value.sync="guanXian.f_pipe_material"
+                :options='pipeMaterial'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></input-select>
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">长度：</label>
+            <div class="col-sm-8">
+              <input type="text" class="form-control input_view" style="width: 100%; height: 90%"
+                     v-model="guanXian.f_pipe_length" />
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">起点：</label>
+            <div class="col-sm-8">
+              <input type="text" class="form-control input_view" style="width: 100%"
+                     v-model="guanXian.f_starting_point" />
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">终点：</label>
+            <div class="col-sm-8">
+              <input type="text" class="form-control input_view" style="width: 100%"
+                     v-model="guanXian.f_end_point" />
+            </div>
+          </div>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button type="button" class="btn btn-primary" :disabled='!$v.valid' @click="saveXianLu()">保存线路</button>
+        </footer>
+      </modal>
+    </validator>
+
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from "vue-client";
+import Vue from 'vue'
+
+export default {
+  title: '线路明细',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  data () {
+    return {
+      showGuanXian: false,  // 展示支线明细
+      model: {
+        data: null
+      },       // 记录
+      branchTrunks: [{label: '支线', value: '支线'}, {label: '干线', value: '干线'}],
+      pipeDiameters: [...this.$appdata.getParam('管径')],
+      pipeMaterial: [...this.$appdata.getParam('管材')],
+      guanXian: {
+
+      }
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    // 新增线路明细
+    async saveXianLu () {
+      let http = new HttpResetClass()
+      let data = {
+        f_process_id: this.selectdata.f_process_id,
+        user: Vue.user,
+        guanXian: this.guanXian,
+        selectdata: this.selectdata
+      }
+      await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/addApplyXianLu`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '新增线路失败！'
+      }).then((res) => {
+        this.guanXian = {}
+
+        this.showGuanXian = false
+        this.$dispatch('breakControl', res.data)
+      })
+    },
+    async deleteXianLu(row){
+      this.$resetdelete(`${this.$androidUtil.getProxyUrl()}/rs/entity/t_pipeline_material_apply`, {id: row.id}, {
+        resolveMsg: '删除成功',
+        rejectMsg: '删除失败'
+      }).then((res) => {
+        this.$dispatch("delResid", row.id)
+        this.$dispatch('breakControl', this.selectdata)
+      })
+    },
+    async search () {
+      let http = new HttpResetClass()
+      let data = {
+        f_process_id: this.selectdata.f_process_id
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/getZhiXianMingXi`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '线路明细查询失败！！！'
+      })
+      this.model.data = res.data
+    },
+    showGuanXianModal(row){
+      this.guanXian = row
+      this.showGuanXian = !this.showGuanXian
+    },
+    closeModal() {
+      this.showGuanXian = false
+      this.guanXian = {}
+      this.search()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.form-control{
+  padding: 8px 12px;
+}
+</style>

package/src/components/android/Task/ShenHe/BuZhangShenHe.vue

@@ -1,64 +1,64 @@
-<template>
-  <div>
-    <tabset v-ref:tabs :close="false" nav-style="tabs nav-apply-tab2" :active.sync="active">
-      <tab header='任务列表'>
-        <app-exploration-user v-ref:exploration :defname="defname" :f_lat="f_lat" :f_lng="f_lng"></app-exploration-user>
-      </tab>
-    </tabset>
-  </div>
-</template>
-<script>
-import {HttpResetClass, PagedList} from 'vue-client'
-import Vue from 'vue'
-
-export default {
-  title: '部长审核',
-  data () {
-    return {
-      labelmarksarray: [],
-      tasknumber: 0,
-      active: 0,
-      f_lat: null,
-      f_lng: null,
-      defname: '部长审核'
-    }
-  },
-  ready () {
-    console.log('部长审核')
-  },
-  methods: {
-    diyspotmouseclick (data) {
-      this.f_lat = data.f_lat
-      this.f_lng = data.f_lng
-
-      this.active = 1
-    }
-  },
-  events: {
-    'refreshDot' () {
-    }
-  },
-  watch: {
-  },
-  computed: {
-  }
-}
-</script>
-<style scoped>
-.tip{
-  position: absolute;
-  z-index: 1000;
-  color: red;
-  font-size: 24px;
-  right: 30px;
-  padding-top: 20px;
-}
-</style>
-<style lang="less">
-.nav-apply-tab2 {
-  li {
-    width: 100%;
-    text-align: center;
-  }
-}
-</style>
+<template>
+  <div>
+    <tabset v-ref:tabs :close="false" nav-style="tabs nav-apply-tab2" :active.sync="active">
+      <tab header='任务列表'>
+        <app-exploration-user v-ref:exploration :defname="defname" :f_lat="f_lat" :f_lng="f_lng"></app-exploration-user>
+      </tab>
+    </tabset>
+  </div>
+</template>
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '部长审核',
+  data () {
+    return {
+      labelmarksarray: [],
+      tasknumber: 0,
+      active: 0,
+      f_lat: null,
+      f_lng: null,
+      defname: '部长审核'
+    }
+  },
+  ready () {
+    console.log('部长审核')
+  },
+  methods: {
+    diyspotmouseclick (data) {
+      this.f_lat = data.f_lat
+      this.f_lng = data.f_lng
+
+      this.active = 1
+    }
+  },
+  events: {
+    'refreshDot' () {
+    }
+  },
+  watch: {
+  },
+  computed: {
+  }
+}
+</script>
+<style scoped>
+.tip{
+  position: absolute;
+  z-index: 1000;
+  color: red;
+  font-size: 24px;
+  right: 30px;
+  padding-top: 20px;
+}
+</style>
+<style lang="less">
+.nav-apply-tab2 {
+  li {
+    width: 100%;
+    text-align: center;
+  }
+}
+</style>

package/src/components/android/Task/ShenHe/JingLiShenHe.vue

@@ -1,64 +1,64 @@
-<template>
-  <div>
-    <tabset v-ref:tabs :close="false" nav-style="tabs nav-apply-tab2" :active.sync="active">
-      <tab header='任务列表'>
-        <app-exploration-user v-ref:exploration :defname="defname" :f_lat="f_lat" :f_lng="f_lng"></app-exploration-user>
-      </tab>
-    </tabset>
-  </div>
-</template>
-<script>
-import {HttpResetClass, PagedList} from 'vue-client'
-import Vue from 'vue'
-
-export default {
-  title: '经理审核',
-  data () {
-    return {
-      labelmarksarray: [],
-      tasknumber: 0,
-      active: 0,
-      f_lat: null,
-      f_lng: null,
-      defname: '经理审核'
-    }
-  },
-  ready () {
-    console.log('经理审核')
-  },
-  methods: {
-    diyspotmouseclick (data) {
-      this.f_lat = data.f_lat
-      this.f_lng = data.f_lng
-
-      this.active = 1
-    }
-  },
-  events: {
-    'refreshDot' () {
-    }
-  },
-  watch: {
-  },
-  computed: {
-  }
-}
-</script>
-<style scoped>
-.tip{
-  position: absolute;
-  z-index: 1000;
-  color: red;
-  font-size: 24px;
-  right: 30px;
-  padding-top: 20px;
-}
-</style>
-<style lang="less">
-.nav-apply-tab2 {
-  li {
-    width: 100%;
-    text-align: center;
-  }
-}
-</style>
+<template>
+  <div>
+    <tabset v-ref:tabs :close="false" nav-style="tabs nav-apply-tab2" :active.sync="active">
+      <tab header='任务列表'>
+        <app-exploration-user v-ref:exploration :defname="defname" :f_lat="f_lat" :f_lng="f_lng"></app-exploration-user>
+      </tab>
+    </tabset>
+  </div>
+</template>
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '经理审核',
+  data () {
+    return {
+      labelmarksarray: [],
+      tasknumber: 0,
+      active: 0,
+      f_lat: null,
+      f_lng: null,
+      defname: '经理审核'
+    }
+  },
+  ready () {
+    console.log('经理审核')
+  },
+  methods: {
+    diyspotmouseclick (data) {
+      this.f_lat = data.f_lat
+      this.f_lng = data.f_lng
+
+      this.active = 1
+    }
+  },
+  events: {
+    'refreshDot' () {
+    }
+  },
+  watch: {
+  },
+  computed: {
+  }
+}
+</script>
+<style scoped>
+.tip{
+  position: absolute;
+  z-index: 1000;
+  color: red;
+  font-size: 24px;
+  right: 30px;
+  padding-top: 20px;
+}
+</style>
+<style lang="less">
+.nav-apply-tab2 {
+  li {
+    width: 100%;
+    text-align: center;
+  }
+}
+</style>

package/src/components/android/Task/ShiGongXinXi/AppShowBuildUser.vue

@@ -213,7 +213,7 @@
             </div>
 
             <div class="col-xs-12 text-right">
-              <button class="btn btn-info" @click="$parent.$parent.$parent.click(row)">处理</button>
+              <button class="btn btn-info" @click="$parent.$parent.$parent.click(row)">查看</button>
             </div>
           </div>
         </div>
@@ -230,7 +230,7 @@ export default {
   props: ['defname', 'f_lat', 'f_lng', 'usertype'],
   data () {
     return {
-      model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/showBuildCheckuser`, 20, {
+      model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/yiBanSupervisory`, 20, {
         data: {
           userid: Vue.user.id,
           f_filiale: Vue.user.f_fengongsi
@@ -277,24 +277,28 @@ export default {
       this.$refs.cp.$refs.cri.search()
       this.criteriaShow = false
     },
+    //f_construction_unit  施工单位     //f_supervisor_operator_id 监理单位
+    //f_check_operator_id 检测单位     //f_supervisor_operator     监理单位
+    //f_engineering_operator_id 土建单位 //f_construct_operator_id 建设单位
     searchCondition (args) {
       if (this.defname === '施工信息'){
-        args.condition = args.condition + ` and act.defname = '工程施工' and (f_construction_unit = '${Vue.user.id}'
-        or f_check_operator_id = '${Vue.user.id}' or f_engineering_operator_id = '${Vue.user.id}'
-        or f_supervisor_operator_id = '${Vue.user.id}' or f_supervisor_operator = '${Vue.user.id}'
-        or f_construct_operator_id = '${Vue.user.id}')`
+       // args.condition = args.condition + ` and act.defname = '工程施工' and (f_construction_unit = '${Vue.user.id}'
+        // or f_check_operator_id = '${Vue.user.id}' or f_engineering_operator_id = '${Vue.user.id}'
+        // or f_supervisor_operator_id = '${Vue.user.id}' or f_supervisor_operator = '${Vue.user.id}'
+        //or f_construct_operator_id = '${Vue.user.id}')`
       }else {
         args.condition += `and act.defname = '${this.defname}'`
       }
       if (this.usertype){
+        //报建类型  f_apply_type
         args.condition += `and u.f_apply_type = '${this.usertype}'`
       }
       if (!isEmpty(this.f_lat) && !isEmpty(this.f_lng)) {
+        // 维度  经度
         args.condition += `and u.f_lat = '${this.f_lat}' and u.f_lng = '${this.f_lng}'`
       }
       console.log("args.condition",args.condition)
       this.model.search(args.condition, args.model)
-
       this.f_lat = null
       this.f_lng = null
     },

package/src/components/android/Task/UpBuild/UpBuildDui.vue

@@ -1,9 +1,12 @@
 <template>
   <div>
     <tabset v-ref:tabs :close="false" nav-style="tabs nav-apply-tab2" :active.sync="active">
-      <tab header='任务列表' style="width: auto">
+      <tab header='报建' style="width: auto">
         <app-exploration-user v-ref:exploration :defname="defname" :f_lat="f_lat" :f_lng="f_lng"></app-exploration-user>
       </tab>
+      <tab header='管线' style="width: auto">
+        <app-exploration-guan-xian v-ref:exploration :defname="defname" :f_lat="f_lat" :f_lng="f_lng"></app-exploration-guan-xian>
+      </tab>
     </tabset>
   </div>
 </template>
@@ -88,7 +91,7 @@ export default {
 <style lang="less">
 .nav-apply-tab2 {
   li {
-    width: 100%;
+    width: 50%;
     text-align: center;
   }
 }

package/src/components/android/Task/UpBuild/UpBuildTsak.vue

@@ -1,9 +1,12 @@
 <template>
   <div>
     <tabset v-ref:tabs :close="false" nav-style="tabs nav-apply-tab2" :active.sync="active">
-      <tab header='任务列表' style="width: auto">
+      <tab header='报建' style="width: auto">
         <app-exploration-user v-ref:exploration :defname="defname" :f_lat="f_lat" :f_lng="f_lng"></app-exploration-user>
       </tab>
+      <tab header='管线' style="width: auto">
+        <app-exploration-guan-xian v-ref:exploration :defname="'管线建设派工'" :f_lat="f_lat" :f_lng="f_lng"></app-exploration-guan-xian>
+      </tab>
     </tabset>
   </div>
 </template>
@@ -88,7 +91,7 @@ export default {
 <style lang="less">
 .nav-apply-tab2 {
   li {
-    width: 100%;
+    width: 50%;
     text-align: center;
   }
 }