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

src/assets/styles/personalized/index.scss

@@ -11,3 +11,14 @@
     }
   }
 }
+
+.el-table__row {
+  .el-selector__tags {
+    width: 100% !important;
+  }
+  .el-selector__readonly-text {
+    input {
+      padding: 0 !important;
+    }
+  }
+}

src/views/component/device/ConfirmationRecord.vue

@@ -174,6 +174,7 @@ export default {
       } = await calibrateResultRecord({
         requestPage: this.requestPage,
         parameters: [
+          { key: 'Q^yuan_she_bei_bian^S', value: this.params.yuanSheBeiBian },
           { key: 'Q^ming_cheng_^S', value: this.params.id },
           { key: 'Q^shi_fou_guo_shen_^S', value: '已完成' }
         ],

src/views/component/device/calibrationCheckRecord.vue

@@ -96,6 +96,7 @@ export default {
         requestPage: this.requestPage,
         parameters: [
           { key: 'Q^she_bei_bian_hao_^S', value: this.params.id },
+          { key: 'Q^yuan_she_bei_bian^S', value: this.params.yuanSheBeiBian },
           { key: 'Q^marks_^S', value: 'record' },
           { key: 'Q^shi_shi_ri_qi_^SNE', value: 'value' } // 过滤空值 value需有值
         ],

src/views/component/device/deviceDialog.vue

@@ -137,7 +137,11 @@
                         >
                       </template>
                       <el-input
-                        v-if="!readonly"
+                        v-if="
+                          !readonly &&
+                          (!originalEditReadOnly ||
+                            actionDialog === 'customAdd')
+                        "
                         v-model="form.yuanSheBeiBian"
                         size="mini"
                       />
@@ -1162,6 +1166,10 @@ export default {
       type: Boolean,
       default: false
     },
+    actionDialog: {
+      type: String,
+      default: ''
+    },
     params: {
       type: Object,
       default: function () {
@@ -1308,6 +1316,7 @@ export default {
       Ids: [],
       showzhuCeYouXiaoQi: false,
       dynamicRequiredFields: false,
+      originalEditReadOnly: false,
       form: {
         gouJinRiQi: '', // 购进日期
         changShang: '', // 厂家/品牌
@@ -1677,32 +1686,32 @@ export default {
     goSave(flag) {
       this.$refs.form.validate(async (valid) => {
         this.$refs.formBase.validate(async (validBase) => {
-        if (valid&&validBase) {
-          try {
-            // 维护项目
-            this.form.maintenanceItemPoList =
-              this.$refs.MaintenanceRef?.[0]?.listDataCopy ||
-              this.form.maintenanceItemPoList ||
-              []
-            // 附属设备及配件
-            this.form.accessoriesDevicePoList =
-              this.$refs.MoreDevicesRef?.[0]?.listDataCopy ||
-              this.form.accessoriesDevicePoList ||
-              []
-            await this.checkRequired()
-            if (this.isEdit) {
-              this.goEdit(flag)
-            } else {
-              this.goAdd()
+          if (valid && validBase) {
+            try {
+              // 维护项目
+              this.form.maintenanceItemPoList =
+                this.$refs.MaintenanceRef?.[0]?.listDataCopy ||
+                this.form.maintenanceItemPoList ||
+                []
+              // 附属设备及配件
+              this.form.accessoriesDevicePoList =
+                this.$refs.MoreDevicesRef?.[0]?.listDataCopy ||
+                this.form.accessoriesDevicePoList ||
+                []
+              await this.checkRequired()
+              if (this.isEdit) {
+                this.goEdit(flag)
+              } else {
+                this.goAdd()
+              }
+            } catch (error) {
+              this.$message.warning(error.message)
             }
-          } catch (error) {
-            this.$message.warning(error.message)
+          } else {
+            return this.$message.warning('请填写必填项！')
           }
-        } else {
-          return this.$message.warning('请填写必填项！')
-        }
+        })
       })
-    })
     },
     // 刷新
     async goRefresh() {},
@@ -1735,6 +1744,7 @@ export default {
       const deviceres = await getSetting('device')
       this.showzhuCeYouXiaoQi = deviceres?.showzhuCeYouXiaoQi || false
       this.dynamicRequiredFields = deviceres?.requiredField || false
+      this.originalEditReadOnly = deviceres?.originalEditReadOnly || false
       if (this.hideSysDeviceNo) {
         this.rules.yuanSheBeiBian[0].message = '设备编号不能为空'
       }

src/views/component/device/index.vue

@@ -390,6 +390,7 @@
       :has-fu-ze-ren-dian-hua="hasFuZeRenDianHua"
       :has-chang-jia-lian-xi-ren="hasChangJiaLianXiRen"
       :readonly="!hasRole || readOnly"
+      :actionDialog="actionDialog"
       :hidefu-jian-shang="hidefuJianShang"
       @close="close"
     />
@@ -589,6 +590,7 @@ export default {
       },
       params: {},
       deviceDialogShow: false,
+      actionDialog: '',
       position: position,
       level: level.second || level.first,
       userId: userId,
@@ -1237,7 +1239,7 @@ export default {
           this.getDatas()
           break
         case 'customAdd':
-          this.handleCustomAdd()
+          this.handleCustomAdd('customAdd')
           break
         case 'customSetting':
           this.handleCustomSetting()
@@ -1308,12 +1310,14 @@ export default {
       this.sorts = [{ field: s, order: o }]
       this.getDatas()
     },
-    handleCustomAdd() {
+    handleCustomAdd(action) {
       this.params = {}
       this.deviceDialogShow = true
+      this.actionDialog = action
     },
     close() {
       this.deviceDialogShow = false
+      this.actionDialog = ''
       this.getDatas()
     },
     goEdit(row) {

src/views/component/device/maintenanceRecord.vue

@@ -125,13 +125,15 @@ export default {
       this.DialogVisible = true
     },
     async getData() {
+      console.log(this.params, 'this.paramsthis.params')
       this.loading = true
       const {
         data: { dataResult, pageResult }
       } = await queryMaintenanceRecord({
         requestPage: this.requestPage,
         parameters: [
-          { key: 'Q^ri_qi_^S', value: this.params.sheBeiShiBieH },
+          { key: 'Q^she_bei_bian_hao_^SL', value: this.params.id },
+          { key: 'Q^original_device_n^S', value: this.params.yuanSheBeiBian },
           { key: 'Q^shi_fou_guo_shen_^S', value: '已完成' }
         ],
         sorts: [{ field: 'bian_zhi_shi_jian', order: 'desc' }]

src/views/component/device/repairRecord.vue

@@ -121,7 +121,8 @@ export default {
       } = await queryRepairRecord({
         requestPage: this.requestPage,
         parameters: [
-          { key: 'Q^she_bei_bian_hao_^S', value: this.params.sheBeiShiBieH },
+          { key: 'Q^she_bei_id_^SL', value: this.params.id },
+          { key: 'Q^yuan_she_bei_bian^S', value: this.params.yuanSheBeiBian },
           { key: 'Q^shi_fou_guo_shen_^S', value: '已完成' }
         ],
         sorts: [{ field: 'bian_zhi_shi_jian', order: 'desc' }]

src/views/component/device/scrappedRecord.vue

@@ -170,6 +170,7 @@ export default {
       } = await queryScrappedRecord({
         requestPage: this.requestPage,
         parameters: [
+          { key: 'Q^yuan_she_bei_bian^S', value: this.params.yuanSheBeiBian },
           { key: 'Q^she_bei_id_^S', value: this.params.id },
           { key: 'Q^shi_fou_guo_shen_^S', value: '已完成' }
         ],

src/views/component/newReagent/newReagent.vue

@@ -4,7 +4,13 @@
       <el-row type="flex">
         <el-col class="button">
           <div class="title">平行实验/留样再测</div>
-          <div v-if="nodeId === 'Activity_0xkc1ji' || readonly" />
+          <div
+            v-if="
+              nodeId === 'Activity_0xkc1ji' ||
+              this.nodeId === 'Activity_1jrjycx' ||
+              readonly
+            "
+          />
           <div v-else>
             <span style="color: red; margin-right: 20px; font-size: 16px"
               >注意：手动计算与导入不可混用</span
@@ -310,7 +316,10 @@ export default {
     this.isCb = t1.positionName === '川北医学院附属医院'
     // console.log(t1.positionName)
     this.nodeId = this.params ? this.params.nodeId : ''
-    this.disabled = this.readonly || this.nodeId === 'Activity_0xkc1ji'
+    this.disabled =
+      this.readonly ||
+      this.nodeId === 'Activity_0xkc1ji' ||
+      this.nodeId === 'Activity_1jrjycx'
     this.showAndHide(this.formData.fangAn)
   },
   methods: {

src/views/platform/bpmn/bpmInstHis/list.vue

@@ -451,27 +451,40 @@ export default {
     })
 
     const { role = [] } = this.$store.getters.userInfo || {}
-    const roleList = ['xtgljs', 'xxglxzfzr', 'wjglzzc', 'syszr']
-    // 系统管理角色、信息管理负责人、检验科主任添加删除按钮
-    const hasRole = role.some((item) => roleList.includes(item.alias))
-    this.listConfig.toolbars.push({
-      key: 'detail',
-      label: '详情',
-      type: 'info'
-    })
-    if (hasRole) {
-      // 系统管理角色不做分类过滤
-      // this.hasPermission = false
-      const btn = [
-        {
-          key: 'remove',
-          label: '删除',
-          type: 'danger'
+    this.$common
+      .request('query', {
+        key: 'getModifyRole',
+        params: [null]
+      })
+      .then((res) => {
+        const configList = res.variables.data
+        if (configList) {
+          const roleList =
+            configList.length > 0
+              ? configList[0].kai_fang_gang_wei.split(',')
+              : ['xtgljs', 'xxglxzfzr', 'wjglzzc', 'syszr']
+          // 系统管理角色、信息管理负责人、检验科主任添加删除按钮
+          const hasRole = role.some((item) => roleList.includes(item.alias))
+          this.listConfig.toolbars.push({
+            key: 'detail',
+            label: '详情',
+            type: 'info'
+          })
+          if (hasRole) {
+            // 系统管理角色不做分类过滤
+            // this.hasPermission = false
+            const btn = [
+              {
+                key: 'remove',
+                label: '删除',
+                type: 'danger'
+              }
+            ]
+            this.listConfig.toolbars.push(...btn)
+            this.selection = true
+          }
         }
-      ]
-      this.listConfig.toolbars.push(...btn)
-      this.selection = true
-    }
+      })
   },
   methods: {
     replaceFormName(row, column, cellValue, index) {

src/views/platform/file/attachment/list.vue

@@ -76,23 +76,6 @@ export default {
   },
   mixins: [FixHeight],
   data() {
-    const extType = [
-      'txt',
-      'pdf',
-      'doc',
-      'docx',
-      'xls',
-      'xlsx',
-      'ppt',
-      'pptx',
-      'wps',
-      'jpg',
-      'jpeg',
-      'png',
-      'gif',
-      'mp3',
-      'mp4'
-    ]
     return {
       dialogFormVisible: false, // 弹窗
       modifyNameVisible: false,
@@ -114,8 +97,32 @@ export default {
 
       listData: [],
       pagination: {},
-      sorts: {},
-      listConfig: {
+      sorts: {}
+    }
+  },
+  computed: {
+    setting() {
+      return this.$store.getters.setting
+    },
+    listConfig() {
+      const extType = [
+        'txt',
+        'pdf',
+        'doc',
+        'docx',
+        'xls',
+        'xlsx',
+        'ppt',
+        'pptx',
+        'wps',
+        'jpg',
+        'jpeg',
+        'png',
+        'gif',
+        'mp3',
+        'mp4'
+      ]
+      return {
         toolbars: [
           {
             key: 'search'
@@ -131,7 +138,8 @@ export default {
             icon: 'ibps-icon-download'
           },
           {
-            key: 'remove'
+            key: 'remove',
+            visible: !this.setting.hiddenSysFile
           }
         ],
         searchForm: {
@@ -176,7 +184,8 @@ export default {
             {
               key: 'modifyName',
               label: '修改文件名',
-              icon: 'ibps-icon-eraser'
+              icon: 'ibps-icon-eraser',
+              visible: !this.setting.hiddenSysFile
             },
             {
               key: 'detail',
@@ -188,7 +197,8 @@ export default {
               icon: 'ibps-icon-download'
             },
             {
-              key: 'remove'
+              key: 'remove',
+              visible: !this.setting.hiddenSysFile
             }
           ]
         }
@@ -292,7 +302,11 @@ export default {
               newTab.document.write('<style>body { margin: 0px; }</style>')
               newTab.document.head.appendChild(link)
               newTab.document.write(
-                `<iframe src="${this.$baseUrl}lib/pdfjs-dist/web/viewer.html?file=${encodeURIComponent(url)}&hasRole=${hasRole}" style="width:100%; height:100%;" frameborder="0";>`
+                `<iframe src="${
+                  this.$baseUrl
+                }lib/pdfjs-dist/web/viewer.html?file=${encodeURIComponent(
+                  url
+                )}&hasRole=${hasRole}" style="width:100%; height:100%;" frameborder="0";>`
               )
             })
           } else {