safecheck-client 3.0.39-8 → 3.0.39-81

package/src/filiale/jiaocheng/android.js

@@ -4,6 +4,7 @@ import Vue from "vue";
 // 手机特殊目录注册到该文件中
 let specialComp = {
   'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo'], resolve) },
+  'current-create': (resolve) => { require(['./android/CurrentCreate'], resolve) },
   'safecheck-devices': (resolve) => { require(['./android/SafecheckDevices'], resolve) },
   'paper-feedback': (resolve) => { require(['./android/PaperFeedback'], resolve) },
   'add-plan-item': (resolve) => { require(['./android/AddPlanItem'], resolve) }

package/src/filiale/jiaocheng/pc/CheckSearchUser.vue

@@ -179,6 +179,17 @@
                         :value-single="true">
               </v-select>
             </div>
+            <div :class="$parent.$parent.style" v-show="$parent.$parent.criteriaShow">
+              <label class="font_normal_body">用户标签</label>
+              <v-select class="select_list select"
+                        placeholder='用户标签' style="width: 60%"
+                        :value.sync="model.f_user_nature" v-model="model.f_user_nature"
+                        :options='$parent.$parent.user_natures'
+                        close-on-select clear-button
+                        condition="f_user_nature = '{}'"
+                        :value-single="true">
+              </v-select>
+            </div>
           </div>
 
           <div class="row" v-show="$parent.$parent.$parent.showItem">
@@ -363,6 +374,9 @@
             <th>
               <nobr>建档日期</nobr>
             </th>
+            <th>
+              <nobr>用户标签</nobr>
+            </th>
             <th>
               <nobr>通气日期</nobr>
             </th>
@@ -390,6 +404,7 @@
           </td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_createfile_date }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_gas_date }}</td>
+          <td v-bind:class="{newcolor:row.code==1}" style="text-align: center">{{ row.f_user_nature }}</td>
           <td v-bind:class="{newcolor:row.code==1}" style="text-align: center" v-show="$parent.$parent.$parent.showcode">
             <button class="button_spacing button_search-1" @click.stop='$parent.$parent.$parent.searchInfo(row.f_userinfo_code)' >点击</button>
           </td>
@@ -470,7 +485,8 @@ export default {
         'f_last_check_state': '安检状态',
         'f_last_check_result': '安检结果',
         'f_createfile_date': '建档日期',
-        'f_gas_date': '通气日期'
+        'f_gas_date': '通气日期',
+        'f_user_nature': '用户标签'
       },
       model: new PagedList('rs/sql/根据安检员查询用户档案', 20, {
         orderitem: "'f_last_check_date'",
@@ -482,6 +498,7 @@ export default {
       checkersid: [],
       checkStates:[],
       SafeCheckXZ: '',
+      user_natures: this.$appdata.getParam('用户标签'),
       civil: '',   //民用安检周期
       civilian: '',      //非民用安检周期
       SafeCheckXZs: [{label: '全部', value: ''}, {label: '未安检', value: '未安检'}, {label: '已安检', value: '已安检'}], // 安检筛选选项

package/src/filiale/jiaocheng/pc/NewCheckpaper.vue

@@ -355,6 +355,10 @@ div {
               </tr>
               </tbody>
             </table>
+            <div v-show="showButton">
+              <button class="button_spacing button_search" @click="auditSuccesss()">通过</button>
+              <button class="button_spacing button_search" @click="auditFail()">不通过</button>
+            </div>
           </div>
         </div>
 
@@ -422,12 +426,27 @@ div {
       <button type="button" class="btn btn-success" @click='imgclose'>关闭</button>
     </footer>
   </modal>
+  <modal :show.sync="showModel" :width="'50%'" :backdrop="false">
+    <div slot="modal-header" class="modal-header">
+      <h4 class="modal-title">
+        安检审核备注
+      </h4>
+    </div>
+    <div slot="modal-body" class="modal-body">
+      <div class="row">
+        <div class="form-group col-sm-4">
+          <label class="font_normal_body">审核备注:</label>
+          <textarea v-model="message"></textarea>
+        </div>
+      </div>
+    </div>
+    <div slot="modal-footer" class="modal-footer" style="text-align: center">
+      <button class="button_search" style="margin-right: 15px" @click="auditFailOK()">确定</button>
+      <button class="button_search" style="margin-right: 15px" @click="auditFailCancel()">取消</button>
+    </div>
+  </modal>
 </template>
 <script>
-// import PaperUserm from './PaperUserm'
-// import PaperStatem from './PaperStatem'
-// import Devicesm from './Devicesm'
-// import PaperFeedbackm from './PaperFeedbackm'
 import ObjConfig from '../../../utils/GerJsonObjectConfig'
 import RadioGroup from 'vue-client/src/vue-strap/src/radioGroup'
 import Radio from 'vue-client/src/vue-strap/src/radioBtn'
@@ -507,6 +526,9 @@ export default {
   props: ['f_plan_id', 'item', 'role'],
   data() {
     return {
+      showModel:false,
+      showButton:false,
+      message:'',
       data: {
         f_devices: [],
         f_defect_content: ''
@@ -630,6 +652,43 @@ export default {
     }
   },
   methods: {
+    auditSuccesss() {
+      this.loading = true;
+      let sql = `update t_check_paper set f_approved_by='${this.$login.f.name}',f_approved_time='${Util.getNowDate()}',f_approved='不通过' where id='${this.item.id}'`
+      new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: sql}}, {
+        resolveMsg: '安检审核成功！',
+        rejectMsg: '安检审核出错！'
+      }).then((res) => {
+          this.loading = false;
+          this.$back()
+
+      })
+    },
+    auditFail() {
+      this.showModel = true;
+    },
+    showAudit() {
+      if (this.item.f_approved == '未审核' || !this.item.f_approved) {
+        this.showButton = true
+      }
+    },
+    auditFailOK() {
+      this.loading = true;
+      let sql = `update t_check_paper set f_approved_by='${this.$login.f.name}',f_approved_time='${Util.getNowDate()}',f_approved='通过' where id='${this.item.id}'`
+      new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: sql}}, {
+        resolveMsg: '安检审核成功！',
+        rejectMsg: '安检审核出错！'
+      }).then((res) => {
+          this.loading = false;
+          this.message = '';
+          this.showModel = false;
+          this.$back()
+      })
+    },
+    auditFailCancel() {
+      this.showModel = false;
+      this.message = '';
+    },
 // pdf生成
     reportPdf() {
       // 抓取要截图的div的class名
@@ -1291,6 +1350,7 @@ export default {
     }
   },
   ready() {
+    this.showAudit()
     // this.putDevices()
     this.newConfig = this.$appdata.getSingleValue('配置中心获取文件')?this.$appdata.getSingleValue('配置中心获取文件'):'否';
     if (this.item.f_state != '未检' || this.item.f_no_checkplan == '无计划安检' || this.item.f_no_checkplan == '复检') {