licp
2024-04-25 843d421107006d38c9af61c956a3ed30275a5657
修改报告按钮逻辑
已修改6个文件
66 ■■■■ 文件已修改
src/components/do/b1-ins-order/add.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/a6-device-management.vue 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/b1-report-preparation.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/index-index.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/notice-detail.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-ins-order/add.vue
@@ -108,7 +108,7 @@
                    </el-button>
                    <el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-show="active==1">提交</el-button>
          <!-- 审核 -->
                    <el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3">不通过</el-button>
                    <el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3" :disabled="saveLoad">不通过</el-button>
                    <el-button size="medium" type="primary" @click="upInsOrderOfState(1)" :loading="saveLoad"
                        v-show="active==3">通过</el-button>
                    <el-button size="medium" @click="$parent.playOrder(0)">
src/components/view/a6-device-management.vue
@@ -288,7 +288,11 @@
                <el-input v-model="formData2.deviceName" size="small"></el-input>
                            </el-form-item>
              <el-form-item label="生产厂家:">
                <el-input v-model="formData2.deviceName" size="small"></el-input>
                <el-select v-model="formData2.equipmentManager" placeholder="请选择" size="small" style="width:100%">
                <el-option v-for="item in responsiblePersonList" :key="item.value" :label="item.label"
                  :value="item.value">
                </el-option>
              </el-select>
                            </el-form-item>
                            <!-- <el-form-item label="设备负责人:">
                                <el-select v-model="formData2.equipmentManager" placeholder="请选择" size="small" style="width:100%">
@@ -323,9 +327,9 @@
                <!-- 中间布局 -->
                <el-col :span="7">
                    <el-form :label-position="labelPosition" :model="formData2" label-width="110px">
            <el-form-item label="生产厂家EN:">
            <!-- <el-form-item label="生产厂家EN:">
              <el-input v-model="formData2.deviceName" size="small"></el-input>
            </el-form-item>
            </el-form-item> -->
            <el-form-item label="出厂编号:">
              <el-input v-model="formData2.deviceName" size="small"></el-input>
            </el-form-item>
@@ -363,7 +367,7 @@
            <!-- 实验室列表 -->
            <el-form-item label="所属部门:">
              <el-select v-model="formData2.equipmentManager" placeholder="请选择" size="small" style="width:100%">
                <el-option v-for="item in responsiblePersonList" :key="item.value" :label="item.label"
                <el-option v-for="item in componentData.selectField.laboratory.select" :key="item.value" :label="item.label"
                  :value="item.value">
                </el-option>
              </el-select>
@@ -507,6 +511,9 @@
                        },
            insProductIds:{
              select:[]
            },
            laboratory:{
              select:[]
            }
                    },
                    linkEvent: {
@@ -525,6 +532,9 @@
            insProductIds:{
              select:[],
              choose: true
            },
            laboratory:{
              select:[]
            }
                    },
                    requiredAdd: [],
@@ -563,6 +573,7 @@
            this.selectEnumByCategory()
            this.selectDevicePrincipal()
      this.getInsProductIds()
      this.obtainItemParameterList()
        },
        methods: {
            refreshTable() {
@@ -643,6 +654,19 @@
          })
                })
      },
      obtainItemParameterList() {
                this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
                    let data = []
                    res.data.forEach(a=>{
                        data.push({
                            label: a.laboratoryName,
                            value: a.id
                        })
                    })
                    this.componentData.selectField.laboratory.select = data
                    this.componentData.tagField.laboratory.select = data
                })
            },
            handleClose() {
                this.dialogVisible = false;
                this.upLoad = false;
src/components/view/b1-report-preparation.vue
@@ -109,7 +109,7 @@
        <el-button size="small">不通过</el-button>
      </div> -->
      <span slot="footer" class="dialog-footer">
                <el-button @click="issuedReasonVisible=true">不通过</el-button>
                <el-button @click="issuedReasonVisible=true" :disabled="loadingIssued">不通过</el-button>
                <el-button type="primary" @click="subIssued" :loading="loadingIssued">通 过</el-button>
            </span>
        </el-dialog>
@@ -120,7 +120,7 @@
            v-model="reason"></el-input></div>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="issuedReasonVisible=false">取消</el-button>
        <el-button @click="issuedReasonVisible=false" :disabled="loadingIssuedReason">取消</el-button>
                <el-button type="primary" @click="handleIssuedReason" :loading="loadingIssuedReason">确定</el-button>
            </span>
        </el-dialog>
@@ -134,7 +134,7 @@
        <el-button size="small">不批准</el-button>
      </div> -->
      <span slot="footer" class="dialog-footer">
                <el-button @click="approveReasonVisible=true">不批准</el-button>
                <el-button @click="approveReasonVisible=true" :disabled="loadingApprove">不批准</el-button>
                <el-button type="primary" @click="subApprove" :loading="loadingApprove">批 准</el-button>
            </span>
        </el-dialog>
@@ -145,7 +145,7 @@
            v-model="reason"></el-input></div>
      </div>
      <span slot="footer" class="dialog-footer">
        <el-button @click="approveReasonVisible=false">取消</el-button>
        <el-button @click="approveReasonVisible=false" :disabled="loadingApproveReason">取消</el-button>
                <el-button type="primary" @click="handleApproveReason" :loading="loadingApproveReason">确定</el-button>
            </span>
        </el-dialog>
src/components/view/index-index.vue
@@ -361,7 +361,7 @@
                <p>{{ m.theme }}</p>
              </div>
              <div class="list3-item-info">
                <p style="width: 73%;-webkit-line-clamp: 1;" class="ellipsis-multiline">
                <p style="width: 73%;-webkit-line-clamp: 1;cursor: pointer;" class="ellipsis-multiline" @click="goNoticeDetail(m)">
                  <!-- 编号<span style="color:#3A7BFA;"> SB20240101-001 </span>的设备将于2023-09-09 11:11:11过期 -->
                  {{ m.content }}
                </p>
@@ -677,6 +677,19 @@
          })
        })
      },
      goNoticeDetail(row){
      this.$axios.put(this.$api.informationNotification.triggerModificationStatusToRead+'/'+row.id).then(res => {
        row.num = Math.random(100);
        this.$bus.$emit("change", JSON.stringify(row));
        this.$parent.addTab({
          v: "消息详情",
          i: "el-icon-s-tools",
          u: "notice-detail",
          k:35,
          p: "abcd"
        },29);
      })
    },
        },
    }
</script>
src/components/view/notice-detail.vue
@@ -16,8 +16,8 @@
      </div>
    </div>
    <div class="info-box" v-if="noticeInfo.jumpPath">
      <component class="notice-content" :is="noticeInfo.jumpPath" style="height: 500px;" >
          </component>
      <!-- <component class="notice-content" :is="noticeInfo.jumpPath" style="height: 500px;" >
          </component> -->
    </div>
  </div>
</template>
@@ -47,6 +47,7 @@
    this.noticeInfo = JSON.parse(sessionStorage.getItem("noticeInfo"));
    this.$bus.$on("change", (msg) => {
      this.noticeInfo = JSON.parse(msg);
      console.log(this.noticeInfo);
      sessionStorage.setItem("noticeInfo", msg);
    });
  },
src/main.js
@@ -13,9 +13,9 @@
//本地
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://192.168.11.200:8001';//李
const javaApi = 'http://192.168.11.200:8001';//李
// const javaApi = 'http://192.168.11.249:8001';//张
const javaApi = 'http://192.168.11.50:8001';//姜
// const javaApi = 'http://192.168.11.50:8001';//姜
// const javaApi = 'http://192.168.11.2:8001';//柴
// const javaApi = 'http://114.132.189.42:9006';//测试服
//胜云服务器