safecheck-client 3.0.39-7 → 3.0.39-70

package/src/components/issueplan/IssuePlanMain.vue

@@ -1,23 +1,23 @@
-<template>
-  <div class="flex">
-    <section>
-      <div class="flex-row">
-        <div class="over col-md-6">
-          <issue-plan-query  v-ref:query ></issue-plan-query>
-        </div>
-        <div class="span-row over col-md-6">
-          <issue-plan-action :item='$refs.query.selected' ></issue-plan-action>
-        </div>
-      </div>
-    </section>
-  </div>
-</template>
-<script>
-import IssuePlanAction from './IssuePlanAction'
-import IssuePlanQuery from './IssuePlanQuery'
-export default {
-  title: '下发计划',
-  props: ['f'],
-  components: { IssuePlanAction, IssuePlanQuery }
-}
-</script>
+<template>
+  <div class="flex">
+    <section>
+      <div class="flex-row">
+        <div class="over col-md-6">
+          <issue-plan-query  v-ref:query ></issue-plan-query>
+        </div>
+        <div class="span-row over col-md-6">
+          <issue-plan-action :item='$refs.query.selected' ></issue-plan-action>
+        </div>
+      </div>
+    </section>
+  </div>
+</template>
+<script>
+import IssuePlanAction from './IssuePlanAction'
+import IssuePlanQuery from './IssuePlanQuery'
+export default {
+  title: '下发计划',
+  props: ['f'],
+  components: { IssuePlanAction, IssuePlanQuery }
+}
+</script>

package/src/components/notice/NoticeForm.vue

@@ -1,100 +1,100 @@
-<template>
-<div>
-    <validator name='v'>
-        <form novalidate class="form-horizontal">
-            <div class="form-group">
-                <label class="col-sm-2 control-lable">标题：</label>
-                <div class="col-sm-8">
-                    <input class="form-control" type="text" v-model="notice.f_title" v-validate:f_title='{ required: true }' />
-                </div>
-              </div>
-              <div class="form-group">
-                <label class="col-sm-2 control-lable">内容：</label>
-                <div class="col-sm-8">
-                    <textarea class="form-control" type="text" v-model="notice.f_content" v-validate:f_content='{ required: true }'></textarea>
-                </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-2 control-lable">时间：</label>
-                <div class="col-sm-8">
-                    <input readonly='readonly' class="form-control" type="text" v-model="notice.f_time"/>
-                </div>
-            </div>
-            <div class="form-group">
-              <label class="col-sm-2 control-lable">分公司：</label>
-              <div class="col-sm-8">
-                <v-select :value.sync="notice.f_subcompany" :options='$parent.$refs.query.f_divisions' placeholder='请选择子公司'
-                  close-on-select clear-button></v-select>
-              </div>
-            </div>
-            <div class="form-group col-sm-10 text-right">
-              <button type="button" class="btn btn-success width-80" @click="save" v-if="$v.valid">保存</button>
-              <button type="button" class="btn btn-success width-80" @click="anew">新建</button>
-              <button type="button" class="btn btn-success width-80" @click="delete" v-if="$v.valid">删除</button>
-            </div>
-        </form>
-    </validator>
-</div>
-
-</template>
-
-<script>
-import * as Util from '../Util'
-import co from 'co'
-import Vue from 'vue'
-
-let syncSave = function * (self) {
-  self.notice.f_subcompany = self.$parent.$refs.query.f_divisions[0].value
-  yield self.$resetpost('rs/entity/t_notice', self.notice)
-  self.$parent.$refs.query.$refs.cp.$refs.criteria.search()
-}
-
-let syncDelete = function * (self) {
-  yield self.$remove('rs/entity/t_notice/', {id:self.notice.id })
-  self.$parent.$refs.query.$refs.cp.$refs.criteria.search()
-}
-
-export default {
-  title: '公告表单',
-  props: ['notice'],
-  computed: {
-    f_division: {
-      get() {
-        if (!this.notice || !this.notice.f_subcompany)
-          return Vue.f_subcompany
-        else
-          return [this.notice.f_subcompany]
-      },
-      set(val) {
-        this.notice.f_subcompany = val[0]
-      }
-    }
-  },
-  methods: {
-    save() {
-      if (!this.notice) {
-        alert('请选择一个通知。')
-        return
-      }
-      if (!this.notice.id) {
-        this.$set('notice.f_time', Util.toStandardTimeString())
-      }
-      let gen = syncSave(this)
-      return co(gen)
-    },
-    anew() {
-      this.notice = {}
-      this.$set('notice.f_time', Util.toStandardTimeString())
-    },
-    delete() {
-      if (!this.notice) {
-        alert('请选择一个通知。')
-        return
-      }
-      let gen = syncDelete(this)
-      return co(gen)
-    }
-  }
-}
-
-</script>
+<template>
+<div>
+    <validator name='v'>
+        <form novalidate class="form-horizontal">
+            <div class="form-group">
+                <label class="col-sm-2 control-lable">标题：</label>
+                <div class="col-sm-8">
+                    <input class="form-control" type="text" v-model="notice.f_title" v-validate:f_title='{ required: true }' />
+                </div>
+              </div>
+              <div class="form-group">
+                <label class="col-sm-2 control-lable">内容：</label>
+                <div class="col-sm-8">
+                    <textarea class="form-control" type="text" v-model="notice.f_content" v-validate:f_content='{ required: true }'></textarea>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-2 control-lable">时间：</label>
+                <div class="col-sm-8">
+                    <input readonly='readonly' class="form-control" type="text" v-model="notice.f_time"/>
+                </div>
+            </div>
+            <div class="form-group">
+              <label class="col-sm-2 control-lable">分公司：</label>
+              <div class="col-sm-8">
+                <v-select :value.sync="notice.f_subcompany" :options='$parent.$refs.query.f_divisions' placeholder='请选择子公司'
+                  close-on-select clear-button></v-select>
+              </div>
+            </div>
+            <div class="form-group col-sm-10 text-right">
+              <button type="button" class="btn btn-success width-80" @click="save" v-if="$v.valid">保存</button>
+              <button type="button" class="btn btn-success width-80" @click="anew">新建</button>
+              <button type="button" class="btn btn-success width-80" @click="delete" v-if="$v.valid">删除</button>
+            </div>
+        </form>
+    </validator>
+</div>
+
+</template>
+
+<script>
+import * as Util from '../Util'
+import co from 'co'
+import Vue from 'vue'
+
+let syncSave = function * (self) {
+  self.notice.f_subcompany = self.$parent.$refs.query.f_divisions[0].value
+  yield self.$resetpost('rs/entity/t_notice', self.notice)
+  self.$parent.$refs.query.$refs.cp.$refs.criteria.search()
+}
+
+let syncDelete = function * (self) {
+  yield self.$remove('rs/entity/t_notice/', {id:self.notice.id })
+  self.$parent.$refs.query.$refs.cp.$refs.criteria.search()
+}
+
+export default {
+  title: '公告表单',
+  props: ['notice'],
+  computed: {
+    f_division: {
+      get() {
+        if (!this.notice || !this.notice.f_subcompany)
+          return Vue.f_subcompany
+        else
+          return [this.notice.f_subcompany]
+      },
+      set(val) {
+        this.notice.f_subcompany = val[0]
+      }
+    }
+  },
+  methods: {
+    save() {
+      if (!this.notice) {
+        alert('请选择一个通知。')
+        return
+      }
+      if (!this.notice.id) {
+        this.$set('notice.f_time', Util.toStandardTimeString())
+      }
+      let gen = syncSave(this)
+      return co(gen)
+    },
+    anew() {
+      this.notice = {}
+      this.$set('notice.f_time', Util.toStandardTimeString())
+    },
+    delete() {
+      if (!this.notice) {
+        alert('请选择一个通知。')
+        return
+      }
+      let gen = syncDelete(this)
+      return co(gen)
+    }
+  }
+}
+
+</script>

package/src/components/notice/NoticeIssue.vue

@@ -1,20 +1,20 @@
-<template>
-  <div class="flex">
-    <section>
-      <div class="flex-row">
-        <div class="over col-md-6">
-          <notice-query v-ref:query></notice-query>
-        </div>
-        <div class="span-row over col-md-6">
-          <notice-form :notice='$refs.query.selected'></notice-form>
-        </div>
-      </div>
-    </section>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '通知管理'
-}
-</script>
+<template>
+  <div class="flex">
+    <section>
+      <div class="flex-row">
+        <div class="over col-md-6">
+          <notice-query v-ref:query></notice-query>
+        </div>
+        <div class="span-row over col-md-6">
+          <notice-form :notice='$refs.query.selected'></notice-form>
+        </div>
+      </div>
+    </section>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '通知管理'
+}
+</script>

package/src/components/paper/PicViewer.vue

@@ -1,18 +1,18 @@
-<template>
-  <div>
-    <a href="#" class="btn btn-primary" @click="this.$back('items')" width="800" height="600">&lt;&lt;</a>
-    <img :src="pic_path">
-  </div>
-</template>
-
-<script>
-export default {
-  title: '图片浏览',
-  props: ['pic_path'],
-  data() {
-    return {
-      pic_path : this.pic_path
-    }
-  }
-}
-</script>
+<template>
+  <div>
+    <a href="#" class="btn btn-primary" @click="this.$back('items')" width="800" height="600">&lt;&lt;</a>
+    <img :src="pic_path">
+  </div>
+</template>
+
+<script>
+export default {
+  title: '图片浏览',
+  props: ['pic_path'],
+  data() {
+    return {
+      pic_path : this.pic_path
+    }
+  }
+}
+</script>

package/src/components/pc/AddPlanItemYyChange.vue

@@ -96,6 +96,9 @@
             <th>
               <nobr>安检员</nobr>
             </th>
+            <th>
+              <nobr>派单员</nobr>
+            </th>
             <th>
               <nobr>备注</nobr>
             </th>
@@ -109,6 +112,7 @@
           <td style="text-align: center;white-space:nowrap;">{{ row.f_user_name }}</td>
           <td style="text-align: center;white-space:nowrap;">{{ row.f_handler_time }}</td>
           <td style="text-align: center;white-space:nowrap;">{{ row.f_handlercheck_name }}</td>
+          <td style="text-align: center;white-space:nowrap;">{{ row.f_operator }}</td>
           <td style="text-align: center;white-space:nowrap;">{{ row.f_safe_remark }}</td>
         </template>
       </data-grid>
@@ -156,7 +160,7 @@ let select = function* (self) {
   })
 }
 export default {
-  title: '隐患查询',
+  title: '预约安检',
   data() {
     let model = new PagedList('rs/sql/safe_singleTable_OrderBy', 20, {
       items: "'*'",

package/src/components/pc/NewCheckpaper.vue

@@ -202,17 +202,64 @@ div {
               </tr>
               <tr>
                 <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">入户状态:</td>
-                <td colspan="2" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
+                <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
                   {{ paperdata.f_entry_status }}
                 </td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">
-                  <button-link style="color: black" type="button" class="btn btn-link" @click="showpicture2()">
-                    {{ dev.lname }}
-                    查看{{ data.f_entry_status }}照片
-                  </button-link>
-                </td>
+<!--                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">-->
+<!--                  <button-link style="color: black" type="button" class="btn btn-link" @click="showpicture2()">-->
+<!--                    {{ dev.lname }}-->
+<!--                    查看{{ data.f_entry_status }}照片-->
+<!--                  </button-link>-->
+<!--                </td>-->
+              </tr>
+
+              </tbody>
+            </table>
+            <table class="table table-striped table-bordered" style="margin-top: 35px"
+                   v-show="paperdata.f_entry_status=='到访不遇' || paperdata.f_entry_status=='拒检'" >
+              <thead>
+              <tr>
+                <th style="text-align: center">{{paperdata.f_entry_status}}照片</th>
               </tr>
+              </thead>
+              <tbody>
+              <tr>
+                <td style="margin: auto;text-align: center">
+                  <div class="container" style="max-width: 550px;background: #FFFFFF">
 
+                    <div class="img" v-if="paperdata.f_entry_status=='到访不遇'&& paperdata.f_noanswer_path">
+                      <img-self-plus  :src="paperdata.f_noanswer_path" style="float: left"
+                                      width="150"
+                                      height="200"></img-self-plus>
+                    </div>
+                    <div class="img" v-if="paperdata.f_entry_status=='到访不遇'&& paperdata.f_noanswer1_path">
+                      <img-self-plus  :src="paperdata.f_noanswer1_path" style="float: left"
+                                      width="150"
+                                      height="200"></img-self-plus>
+                    </div>
+                    <div class="img" v-if="paperdata.f_entry_status=='到访不遇'&& paperdata.f_noanswer2_path">
+                      <img-self-plus  :src="paperdata.f_noanswer2_path" style="float: left"
+                                      width="150"
+                                      height="200"></img-self-plus>
+                    </div>
+                    <div class="img" v-if="paperdata.f_entry_status=='拒检'&& paperdata.f_rejectcheck_path">
+                      <img-self-plus  :src="paperdata.f_rejectcheck_path" style="float: left"
+                                      width="150"
+                                      height="200"></img-self-plus>
+                    </div>
+                    <div class="img" v-if="paperdata.f_entry_status=='拒检'&& paperdata.f_rejectcheck1_path">
+                      <img-self-plus  :src="paperdata.f_rejectcheck1_path" style="float: left"
+                                      width="150"
+                                      height="200"></img-self-plus>
+                    </div>
+                    <div class="img" v-if="paperdata.f_entry_status=='拒检'&& paperdata.f_rejectcheck2_path">
+                      <img-self-plus  :src="paperdata.f_rejectcheck2_path" style="float: left"
+                                      width="150"
+                                      height="200"></img-self-plus>
+                    </div>
+                  </div>
+                </td>
+              </tr>
               </tbody>
             </table>
             <table class="table table-striped table-bordered" style="margin-top: 40px"
@@ -607,17 +654,64 @@ div {
                 </tr>
                 <tr>
                   <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">入户状态:</td>
-                  <td colspan="2" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
+                  <td colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">
                     {{ paperdata.f_entry_status }}
                   </td>
-                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">
-                    <button-link style="color: black" type="button" class="btn btn-link" @click="showpicture2()">
-                      {{ dev.lname }}
-                      查看{{ data.f_entry_status }}照片
-                    </button-link>
-                  </td>
+<!--                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">-->
+<!--                    <button-link style="color: black" type="button" class="btn btn-link" @click="showpicture2()">-->
+<!--                      {{ dev.lname }}-->
+<!--                      查看{{ data.f_entry_status }}照片-->
+<!--                    </button-link>-->
+<!--                  </td>-->
+                </tr>
+
+                </tbody>
+              </table>
+              <table class="table table-striped table-bordered" style="margin-top: 35px"
+                     v-show="paperdata.f_entry_status=='到访不遇' || paperdata.f_entry_status=='拒检'" >
+                <thead>
+                <tr>
+                  <th style="text-align: center">{{paperdata.f_entry_status}}照片</th>
                 </tr>
+                </thead>
+                <tbody>
+                <tr>
+                  <td style="margin: auto;text-align: center">
+                    <div class="container" style="max-width: 550px;background: #FFFFFF">
 
+                      <div class="img" v-if="paperdata.f_entry_status=='到访不遇'&& paperdata.f_noanswer_path">
+                        <img-self-plus  :src="paperdata.f_noanswer_path" style="float: left"
+                                       width="150"
+                                       height="200"></img-self-plus>
+                      </div>
+                      <div class="img" v-if="paperdata.f_entry_status=='到访不遇'&& paperdata.f_noanswer1_path">
+                        <img-self-plus  :src="paperdata.f_noanswer1_path" style="float: left"
+                                        width="150"
+                                        height="200"></img-self-plus>
+                      </div>
+                      <div class="img" v-if="paperdata.f_entry_status=='到访不遇'&& paperdata.f_noanswer2_path">
+                        <img-self-plus  :src="paperdata.f_noanswer2_path" style="float: left"
+                                        width="150"
+                                        height="200"></img-self-plus>
+                      </div>
+                      <div class="img" v-if="paperdata.f_entry_status=='拒检'&& paperdata.f_rejectcheck_path">
+                        <img-self-plus  :src="paperdata.f_rejectcheck_path" style="float: left"
+                                        width="150"
+                                        height="200"></img-self-plus>
+                      </div>
+                      <div class="img" v-if="paperdata.f_entry_status=='拒检'&& paperdata.f_rejectcheck1_path">
+                        <img-self-plus  :src="paperdata.f_rejectcheck1_path" style="float: left"
+                                        width="150"
+                                        height="200"></img-self-plus>
+                      </div>
+                      <div class="img" v-if="paperdata.f_entry_status=='拒检'&& paperdata.f_rejectcheck2_path">
+                        <img-self-plus  :src="paperdata.f_rejectcheck2_path" style="float: left"
+                                        width="150"
+                                        height="200"></img-self-plus>
+                      </div>
+                    </div>
+                  </td>
+                </tr>
                 </tbody>
               </table>
               <table class="table table-striped table-bordered" style="margin-top: 40px"

package/src/components/pc/PaperDefectMain.vue

@@ -424,7 +424,7 @@
         audioshow:false,
 
         model: model,
-        deal_dispose:[{label:'全部',value:''},{label:'报修',value:'报修'},{label:'现场整改',value:'现场整改'},{label:'自行处理',value:'自行处理'},{label:'未处理',value:'未处理'}],
+        deal_dispose:[{label:'全部',value:''},{label:'报修',value:'报修'},{label:'现场整改',value:'现场整改'},{label:'自行处理',value:'自行处理'},{label:'未处理',value:'未处理'},{label:'已处理',value:'已处理'}],
         repairStateOptions: this.getSafeParam('隐患状态'),
         //searchData:searchData,
         excelHeaders: {