safecheck-client 3.0.35-26 → 3.0.35-29

package/src/filiale/huaran/pc/PlanManage.vue

@@ -20,7 +20,7 @@
              v-for="row in checkplan.list.data" @click="selectPlanChange(row)">
           <table style="width:100%;table-layout:fixed">
             <tr class="safe-planfont">
-              <td rowspan="6"><input type="checkbox" style="pointer-events:auto"
+              <td rowspan="8"><input type="checkbox" style="pointer-events:auto"
                                      v-show="row.plan_count == 0 || row.f_issued == '未下发'"
                                      onClick="event.cancelBubble = true"
                                      :checked="checkplan.check.isChecked(row.f_check_item_id)"
@@ -58,6 +58,18 @@
                   :title="row.f_safecheck_type">{{ row.f_safecheck_type }}
               </td>
             </tr>
+            <tr class="safe-bodyfont" v-if="row.f_share_type">
+              <td colspan="3">共享公司 :</td>
+              <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                  :title="row.f_share_type">{{ row.f_share_type }}
+              </td>
+            </tr>
+            <tr class="safe-bodyfont" v-if="row.f_share_company_name">
+              <td colspan="3">分公司名称 :</td>
+              <td colspan="5" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+                  :title="row.f_share_company_name">{{ row.f_share_company_name }}
+              </td>
+            </tr>
           </table>
         </div>
       </div>
@@ -210,6 +222,13 @@
                       value-single>
             </v-select>
           </div>
+          <div class="form-group col-sm-4">
+            <label class="font_normal_body">任务性质:</label>
+            <v-select class="select select_list" :search="false" :value.sync="createPlan.f_schedule_type"
+                      v-model="createPlan.f_schedule_type" :options='schedule_types' placeholder='请选择' close-on-select
+                      value-single>
+            </v-select>
+          </div>
           <div class="form-group col-sm-4" v-show="createPlan.isShare == '否'">
             <label class="font_normal_body">部&ensp;&ensp;&ensp;&ensp;门:</label>
             <v-select class="select select_list" :search="false" :value.sync="createPlan.f_department_id"
@@ -233,7 +252,7 @@
                       value-single>
             </v-select>
           </div>
-          <div class="form-group col-sm-4">
+          <div class="form-group col-sm-4" v-if="isSeePlanShare">
             <label class="font_normal_body">共享公司:</label>
             <v-select class="select select_list" :value.sync="createPlan.f_share_type" v-model="createPlan.f_share_type"
                       :search="false" :options='isAndNot' placeholder='请选择' close-on-select value-single>
@@ -298,6 +317,20 @@
                       v-model="upCheckPlan.f_safecheck_type" :options='ntoway' close-on-select value-single>
             </v-select>
           </div>
+          <div class="form-group col-sm-4" v-if="isSeePlanShare">
+            <label class="font_normal_body">共享公司:</label>
+            <v-select class="select select_list" :value.sync="upCheckPlan.f_share_type" v-model="upCheckPlan.f_share_type"
+                      :search="false" :options='isAndNot' placeholder='请选择' close-on-select value-single>
+            </v-select>
+          </div>
+          <div class="form-group col-sm-6" v-if="upCheckPlan.f_share_type == '是'">
+            <label class="font_normal_body">分公司名称:</label>
+            <v-select class="select select_list" :value.sync="upCheckPlan.f_share_company_name"
+                      v-model="upCheckPlan.f_share_company_name" :search="false" :options='companyNameList'
+                      placeholder='请选择'
+                      close-on-select value-single>
+            </v-select>
+          </div>
         </div>
       </div>
       <div slot="modal-footer" class="modal-footer" style="text-align: center">
@@ -322,7 +355,10 @@ export default {
       totalTaskList: [],
       departments: [],
       companyNameList: [],
+      // isSeePlanShare: this.$login.r ? this.$login.r.includes("安检任务共享公司") : true,
+      isSeePlanShare: true,
       opt: [{label: "按时间降序", value: "按时间降序"}, {label: "按时间升序", value: "按时间升序"}],
+      schedule_types: [{label: "民用", value: "民用"}, {label: "非民用", value: "非民用"}],
       currentorder: '按时间降序',
       isdelete: this.$login.r ? this.$login.r.includes("安检任务删除") : false,
       checkplan: new SearchList(true),
@@ -342,6 +378,7 @@ export default {
         f_plan_name: '',
         f_total_task_id:'',
         f_plan_year: '',
+        f_schedule_type:'民用',
         f_department_id: '',
         f_plan_month: '',
         isShare: '否',
@@ -576,6 +613,7 @@ export default {
         f_plan_name: '',
         f_plan_year: '',
         f_plan_month: '',
+        f_schedule_type:'民用',
         isShare: '否',
         f_issued: '否',
         f_checker_id: null,
@@ -601,6 +639,10 @@ export default {
         Vue.showMessage("请选择安检月份！")
         return false
       }
+      if (!this.createPlan.f_schedule_type) {
+        Vue.showMessage("请选择任务性质！")
+        return false
+      }
       if (this.createPlan.isShare == "否") {
         if (JSON.stringify(this.createPlan.checker) == '{}') {
           Vue.showMessage("请选择安检人员！")
@@ -691,14 +733,16 @@ export default {
       this.upCheckPlan.f_checker = row.f_checker ? row.f_checker : null
       this.upCheckPlan.isShare = row.f_checker_id ? '否' : '是'
       this.upCheckPlan.f_issued = row.f_issued
+      this.upCheckPlan.f_share_type = row.f_share_type
+      this.upCheckPlan.f_share_company_name = row.f_share_company_name
       this.upCheckPlan.checker = {id: row.f_checker_id, name: row.f_checker}
       this.showUpPlan = true
     },
     async upPlan() {
-      if (this.upCheckPlan.f_issued == '已下发') {
-        this.$showMessage("该任务已下发，无法进行修改！")
-        return
-      }
+      // if (this.upCheckPlan.f_issued == '已下发') {
+      //   this.$showMessage("该任务已下发，无法进行修改！")
+      //   return
+      // }
       if (!this.upCheckPlan.f_plan_name) {
         Vue.showMessage("请输入安检任务名称！")
         return false
@@ -729,6 +773,9 @@ export default {
           f_plan_name: this.upCheckPlan.f_plan_name,
           f_plan_year: this.upCheckPlan.f_plan_year,
           f_plan_month: this.upCheckPlan.f_plan_month,
+          f_share_type: this.upCheckPlan.f_share_type,
+          f_share_company_name: this.upCheckPlan.f_share_type == '否' ? '' : this.upCheckPlan.f_share_company_name,
+          issued:"是",
           f_plan_id: this.upCheckPlan.id
         }
       }, {resolveMsg: null, rejectMsg: null})

package/src/filiale/huaran/pc/checkUserList.vue

@@ -34,6 +34,18 @@
               >
               </v-select>
             </div>
+            <div class="form-group col-sm-1 upuserinfo_sel">
+              <v-select class="select select_list"
+                        :width="'95%'"
+                        class="select select_list"
+                        :value.sync="model.checkBook"
+                        v-model="model.checkBook"
+                        :options='$parent.$parent.checkBooks'
+                        placeholder='安&ensp;检&ensp;册'
+                        :multiple="true"
+              >
+              </v-select>
+            </div>
             <div class="form-group col-sm-4">
               <button class="button_new" style="margin-right: 10px" @click="$parent.$parent.showUserCondition()">
                 更多条件
@@ -273,20 +285,20 @@
                     >
                     </v-select>
                   </div>
-                  <div class="form-group col-sm-4">
-                    <label class="font_normal_body">安&ensp;检&ensp;册:</label>
-                    <v-select
-                      class="select select_list"
-                      :value.sync="model.checkBook"
-                      v-model="model.checkBook"
-                      :options='$parent.$parent.checkBooks'
-                      placeholder='请选择'
-                      :search="false"
-                      close-on-select
-                      value-single
-                    >
-                    </v-select>
-                  </div>
+<!--                  <div class="form-group col-sm-4">-->
+<!--                    <label class="font_normal_body">安&ensp;检&ensp;册:</label>-->
+<!--                    <v-select-->
+<!--                      class="select select_list"-->
+<!--                      :value.sync="model.checkBook"-->
+<!--                      v-model="model.checkBook"-->
+<!--                      :options='$parent.$parent.checkBooks'-->
+<!--                      placeholder='请选择'-->
+<!--                      :search="false"-->
+<!--                      close-on-select-->
+<!--                      value-single-->
+<!--                    >-->
+<!--                    </v-select>-->
+<!--                  </div>-->
                   <div class="form-group col-sm-4">
                     <label class="font_normal_body">通气起始:</label>
                     <datepicker
@@ -513,6 +525,8 @@ export default {
   },
   props: ["selectplan", "userlogin"],
   ready() {
+    console.log('-====')
+    console.log(this.$login.f)
     this.$refs.paged.$refs.criteria.model.f_user_state = '正常'
     // this.hasCheckBooks=this.$appdata.getSingleValue('是否使用安检册')
     // this.$refs.paged.$refs.criteria.model.f_endfile_time=Util.toStartDateYearString()
@@ -533,7 +547,7 @@ export default {
           orderitem: 'id desc'
         }
       }, {resolveMsg: null, rejectMsg: null}).then(res => {
-        this.checkBooks.push({label: '全部', value: ''})
+        // this.checkBooks.push({label: '全部', value: ''})
         res.data.forEach(ress => {
           this.checkBooks.push({
             label: ress.f_check_book_name,
@@ -590,13 +604,26 @@ export default {
           args.condition += ` and ui.f_last_check_date <='${args.model.f_end_time} 23:59:59' `
         }
       }
-
-      if (args.model.checkBook) {
-        let arr = args.model.checkBook.split('-')
-        if (arr[1] == '用户') {
-          args.condition += ` and ua.f_check_book_id='${arr[0]}'`
-        } else {
-          args.condition += ` and area.f_check_book_id=${arr[0]} and ua.f_check_book_id is null`
+      debugger
+      if (args.model.checkBook && Array.isArray(args.model.checkBook)) {
+        let userIds = [];
+        let areaIds = [];
+        args.model.checkBook.forEach(checkBook => {
+          let arr = checkBook.split('-');
+          if (arr[1] == '用户') {
+            userIds.push(arr[0]);
+          } else {
+            areaIds.push(arr[0]);
+          }
+        });
+        if (userIds.length > 0 && areaIds.length == 0) {
+          args.condition += ` and ua.f_check_book_id in (${userIds.map(id => `'${id}'`).join(',')})`;
+        }
+        if (areaIds.length > 0 && userIds.length == 0) {
+          args.condition += ` and area.f_check_book_id in (${areaIds.map(id => `'${id}'`).join(',')}) and ua.f_check_book_id is null`;
+        }
+        if (userIds.length > 0 && areaIds.length > 0){
+          args.condition += ` and (ua.f_check_book_id in (${userIds.map(id => `'${id}'`).join(',')}) or area.f_check_book_id in (${areaIds.map(id => `'${id}'`).join(',')}))`;
         }
       }
       if (this.uploadCodeCondition) {
@@ -812,6 +839,12 @@ export default {
       })
     },
 
+  },
+  watch:{
+    'userlogin.orgid'(){
+      this.getCheckBook()
+      this.loadpage()
+    }
   }
 }
 </script>

package/src/filiale/huaran/pc.js

@@ -16,6 +16,7 @@ let specialComp = {
   'check-book-list': (resolve) => { require(['./pc/CheckBookList.vue'], resolve) },
   'check-book-all': (resolve) => { require(['./pc/CheckBookAll.vue'], resolve) },
   'check-book': (resolve) => { require(['./pc/CheckBook.vue'], resolve) },
+  'check-book-entry': (resolve) => { require(['./pc/CheckBookEntry.vue'], resolve) },
   'check-plan-list': (resolve) => { require(['./pc/checkPlanList'], resolve) },
   'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) },