Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/assets/styles/pages/dashboard.scss

@@ -174,7 +174,10 @@ $transition: all 0.5s;
       }
     }
   }
-
+  .home-calendar {
+    height: 100% !important;
+    font-size: 13px;
+  }
   .home-card {
     .el-card__header {
       padding: 10px 20px;

src/business/platform/form/formbuilder/right-aside/editors/editor-base.vue

@@ -256,6 +256,7 @@
         /></template>
         <el-switch
           v-model="fieldOptions.sortable"
+          @change="sortTableChange"
           active-value="Y"
           inactive-value="N"
         />
@@ -429,6 +430,13 @@ export default {
     }
   },
   methods: {
+    sortTableChange(val) {
+      if (val === 'Y') {
+        this.fieldOptions.page = 'N'
+      } else {
+        this.fieldOptions.page = 'Y'
+      }
+    },
     changeBoName(value, node) {
       if (this.$utils.isNotEmpty(value)) {
         this.fieldItem.label = node.label

src/business/platform/form/formrender/dynamic-form/dynamic-form-table.vue

@@ -1,5 +1,6 @@
 <template>
   <div v-if="!tableHidden && dynamicShow" class="dynamic-form-table">
+    {{ field.field_options.page }}
     <template v-if="columns && columns.length > 0">
       <!--================表内和弹窗模式=================================-->
       <div
@@ -679,7 +680,6 @@ export default {
     },
     handlePagination(val) {
       if (this.canSortable && this.sortFlag) {
-        console.log('我tmd的来了')
         this.copDataModel = []
         this.sortFlag = false
       }
@@ -699,12 +699,16 @@ export default {
           this.currentPage =
             this.currentPage > pageCount ? pageCount : this.currentPage
         }
-
-        this.copDataModel = this.getShowData(
-          val,
-          this.currentPage,
-          this.pageSize
-        )
+        // if (this.needPage === 'N') {
+        //   this.copDataModel = this.dataModel
+        // } else {
+        //   this.copDataModel = this.getShowData(
+        //     val,
+        //     this.currentPage,
+        //     this.pageSize
+        //   )
+        // }
+        this.$emit('update:value', val)
         this.editFromType = ''
       })
 

src/views/system/fasc/facilityEnvConfig.vue

@@ -194,12 +194,12 @@
             <el-table-column
               v-if="shouldShowColumn('deviceno1_')"
               prop="deviceno1_"
-              label="被控设备编号"
+              label="被控设备/设施编号"
             />
             <el-table-column
               v-if="shouldShowColumn('devicename1_')"
               prop="devicename1_"
-              label="被控设备名称"
+              :label="form.lei_xing_!='12-紫外灯消毒'?'被控设备/设施名称':'紫外灯/设备名'"
             />
             <el-table-column
               v-if="shouldShowColumn('deviceno3_')"
@@ -211,7 +211,7 @@
               prop="devicename1_"
               label="被控试剂耗材名称"
             />
-            <el-table-column prop="deviceno2_" label="监控设备" />
+            <el-table-column v-if="form.lei_xing_!='12-紫外灯消毒'" prop="deviceno2_" label="监控设备" />
             <el-table-column
               v-if="!shouldShowColumn('deviceno3_')"
               prop="jian_ce_zhou_qi_"
@@ -473,7 +473,7 @@ export default {
           path: '/sshjgl/aqgl/jykzwdxdjlb',
           showDevice: true,
           displayField: ['deviceno1_', 'devicename1_'],
-          requireField: []
+          requireField: ['deviceno1_']
         },
         '13-高压灭菌': {
           label: '高压灭菌',
@@ -1013,7 +1013,7 @@ export default {
         ) {
           return this.$message.warning(`子表第${i + 1}行监测岗位信息缺失！`)
         }
-        if (this.shouldRequired('deviceno1_') && item.deviceno1_ === '') {
+        if (this.shouldRequired('deviceno1_') && item.deviceno1_ === ''&&this.form.lei_xing_!='12-紫外灯消毒') {
           return this.$message.warning(`子表第${i + 1}行设备缺失！`)
         }
         if (this.shouldRequired('fang_jian_') && item.fang_jian_ === '') {

src/views/system/fasc/fecDialog.vue

@@ -13,7 +13,7 @@
   >
     <div class="contain">
       <div class="main">
-        <el-form ref="form" :model="form" label-width="120px">
+        <el-form ref="form" :model="form" label-width="130px">
           <el-row>
             <el-col :span="12">
               <el-form-item label="部门：">
@@ -147,7 +147,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="12" v-if="lei_xing_ != '12-紫外灯消毒'">
               <el-form-item label="监控设备：">
                 <ibps-link-data
                   v-model="form.deviceno2_"
@@ -169,10 +169,9 @@
             <el-col :span="12">
               <el-form-item
                 v-if="shouldRequired('deviceno1_')"
-                label="被控设备/设施编号："
-                label-width="140"
+                label="被控设备/设施编号"
               >
-                <template slot="label">
+                <template slot="label" v-if="!lei_xing_ == '12-紫外灯消毒'">
                   <span class="required">被控设备/设施编号：</span>
                 </template>
                 <ibps-custom-dialog
@@ -189,11 +188,7 @@
                   @change-link-data="deviceno1Change"
                 />
               </el-form-item>
-              <el-form-item
-                v-else
-                label="被控设备/设施编号："
-                label-width="140"
-              >
+              <el-form-item v-else label="被控设备/设施编号：">
                 <ibps-link-data
                   v-model="form.deviceno1_"
                   style="width: 80%"
@@ -209,11 +204,13 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col v-show="form.deviceno1_" :span="12">
+            <el-col
+              v-show="form.deviceno1_ || lei_xing_ == '12-紫外灯消毒'"
+              :span="12"
+            >
               <el-form-item
                 v-if="shouldRequired('devicename1_')"
                 label="被控设备/设施名称："
-                label-width="140"
               >
                 <template slot="label">
                   <span>被控设备/设施名称</span>
@@ -227,11 +224,10 @@
                 </template>
                 <div>{{ form.devicename1_ }}</div>
               </el-form-item>
-              <el-form-item
-                v-else
-                label="被控设备/设施名称："
-                label-width="140"
-              >
+              <el-form-item v-else label="被控设备/设施名称：">
+                <template slot="label" v-if="lei_xing_ == '12-紫外灯消毒'">
+                  <span class="required">紫外灯/设备名：</span>
+                </template>
                 <el-input
                   v-model="form.devicename1_"
                   size="mini"
@@ -242,7 +238,7 @@
           </el-row>
           <el-row v-if="shouldShowColumn('deviceno3_')">
             <el-col :span="12">
-              <el-form-item label="被控试剂/耗材：" label-width="140">
+              <el-form-item label="被控试剂/耗材：">
                 <template slot="label">
                   <span class="required">被控试剂/耗材：</span>
                 </template>
@@ -262,7 +258,7 @@
               </el-form-item>
             </el-col>
             <el-col v-show="form.deviceno1_" :span="12">
-              <el-form-item label="试剂/耗材名称：" label-width="140">
+              <el-form-item label="试剂/耗材名称：">
                 <template slot="label">
                   <span>试剂/耗材名称</span>
                   <el-tooltip
@@ -586,7 +582,7 @@ export default {
         { label: '按需监测', value: '按需' }
       ],
       config: {},
-      quYuLeiXingList:['06-每日安全检查','15-日常防护消毒']
+      quYuLeiXingList: ['06-每日安全检查', '15-日常防护消毒', '12-紫外灯消毒']
     }
   },
   computed: {
@@ -881,9 +877,18 @@ export default {
       ) {
         throw new Error('监测岗位信息缺失！')
       }
-      if (this.shouldRequired('deviceno1_') && this.form.deviceno1_ === '') {
+      if (
+        this.shouldRequired('deviceno1_') &&
+        this.form.deviceno1_ === '' &&
+        this.lei_xing_ != '12-紫外灯消毒'
+      ) {
         throw new Error('请先选择设备或试剂耗材！')
       }
+      if (
+        this.lei_xing_ == '12-紫外灯消毒'&&this.form.devicename1_ === ''
+      ) {
+        throw new Error('紫外灯/设备名缺失！')
+      }
       if (this.shouldRequired('fang_jian_') && this.form.fang_jian_ === '') {
         throw new Error('请先选择房间！')
       }