Merge remote-tracking branch 'origin/cnas' into cnas

zss

2024-12-25 786c543590b010ecdcbd38062d2fd79523f6227e

Merge remote-tracking branch 'origin/cnas' into cnas

 src/components/view/a7-sample-disposal.vue

@@ -6,9 +6,9 @@
        <!-- <el-button size="medium" type="primary" @click="handleDown" v-loading="outLoading" style="margin-right: 16px;">导出</el-button> -->
      </el-col>
    </el-row>
    <el-tabs type="border-card" v-model="activeName" style="height: 100%;" @tab-click="componentData0.entity.totaldealId=''">
    <el-tabs type="border-card" v-model="activeName" style="height: 100%;" @tab-click="tabClick">
      <el-tab-pane label="填写" name="填写" style="height: 100%;" :key="1">
        <el-button size="small" type="primary" @click="handleAdd0" style="margin-left: 20px;" v-if="addPower">新增</el-button>
        <el-button size="small" type="primary" @click="handleAdd0" style="margin-left: 20px;" v-if="addPower&&currentInfo.examineState!='通过'">新增</el-button>
        <div class="table" style="height: calc(100% - 200px)" v-if="activeName=='填写'">
          <ValueTable ref="ValueTable0" :url="$api.processTotaldeal.pageProcessDeal"
      :componentData="componentData0" :key="upIndex0" :delUrl="$api.processTotaldeal.delProcessDeal" />
@@ -206,7 +206,7 @@
  name: "SampleDisposal",
  data() {
    return {
      activeName:'填写',
      activeName:'历史记录',
      title:'新增',
      addDialogVisible:false,
      addLoading:false,
@@ -265,7 +265,7 @@
            type: 'text',
            method: 'handleCheck',
            disabFun: (row, index) => {
                        return row.examineState=='通过'||row.submitState=='待提交'
                        return row.examineState=='通过'||row.submitState=='待提交'||!row.submitState
            }
          }, {
            id: 'handleApproval',
@@ -273,7 +273,7 @@
            type: 'text',
            method: 'handleApproval',
            disabFun: (row, index) => {
                        return row.ratifyState=='通过'||row.submitState=='待提交'
                        return row.ratifyState=='通过'||row.submitState=='待提交'||!row.submitState
            }
          }],
          tagField: {},
@@ -299,12 +299,18 @@
            id: 'handleAdd0',
            font: '修改',
            type: 'text',
            method: 'handleAdd0'
            method: 'handleAdd0',
            disabFun: (row, index) => {
                          return !this.addPower||this.currentInfo.examineState=='通过'
            }
          },{
            id: 'delete',
            font: '删除',
            type: 'text',
            method: 'doDiy'
            method: 'doDiy',
            disabFun: (row, index) => {
                          return !this.addPower||this.currentInfo.examineState=='通过'
            }
          }],
          tagField: {},
          selectField: {},
@@ -324,6 +330,17 @@
      outPower:false,
      addPower:false,
    };
  },
  watch: {
    'activeName' (val1, val2) {
      if(val1=='填写'){
        this.componentData0.do.forEach((item)=>{
          item.disabFun = (row, index) => {
            return !this.addPower||this.currentInfo.examineState=='通过'
          }
        })
      }
    }
  },
  mounted() {
    this.entityCopy = this.HaveJson(this.componentData.entity);
@@ -475,6 +492,7 @@
    },
    // 查看
    handleLook(row){
      this.currentInfo = row
      // console.log(row)
      // this.title0 = '查看'
      // this.commonFun(row)
@@ -575,8 +593,14 @@
      link.href = url;
      link.download = row.month+' 样品处理申请表';
      link.click();
    },
    tabClick(e){
      if(e.index==0){
        this.currentInfo = this.$refs['ValueTable'].tableData[0]
        this.componentData0.entity.totaldealId=''
      }
    }
  },
  }
}
</script>


 src/components/view/a7-sample-registration.vue

@@ -3,10 +3,10 @@
    <el-row class="title">
      <el-col :span="20" style="padding-left: 20px;text-align: left;">样品接收</el-col>
    </el-row>
    <el-tabs type="border-card" v-model="activeName" style="height: 100%;" @tab-click="componentData0.entity.totalSampleId=''">
    <el-tabs type="border-card" v-model="activeName" style="height: 100%;" @tab-click="tabClick">
      <el-tab-pane label="填写" name="填写" style="height: 100%;" :key="1">
        <el-button size="small" type="primary" @click="handleAdd0" style="margin-left: 20px;" v-if="addPower">新增</el-button>
        <div class="table" style="height: calc(100% - 200px)" F>
        <el-button size="small" type="primary" @click="handleAdd0" style="margin-left: 20px;" v-if="addPower&&currentInfo.examineState!='通过'">新增</el-button>
        <div class="table" style="height: calc(100% - 200px)" v-if="activeName=='填写'">
          <ValueTable ref="ValueTable0" :url="$api.processSample.pageProcessSample"
      :componentData="componentData0" :key="upIndex0" :delUrl="$api.processSample.delProcessSample" />
        </div>
@@ -29,8 +29,8 @@
            <el-button size="small" type="primary" @click="refreshTable()">查 询</el-button>
          </div>
        </div>
        <div class="table">
          <ValueTable ref="ValueTable" v-if="activeName=='历史记录'" :url="$api.processSample.pageProcessTotalSample"
        <div class="table" v-if="activeName=='历史记录'">
          <ValueTable ref="ValueTable" :url="$api.processSample.pageProcessTotalSample"
            :componentData="componentData" :key="upIndex"/>
        </div>
      </el-tab-pane>
@@ -232,7 +232,7 @@
  name: "SampleDisposal",
  data() {
    return {
      activeName:'填写',
      activeName:'历史记录',
      title:'新增',
      addDialogVisible:false,
      addLoading:false,
@@ -291,7 +291,7 @@
            type: 'text',
            method: 'handleCheck',
            disabFun: (row, index) => {
                        return row.examineState=='通过'||row.submitState=='待提交'
                        return row.examineState=='通过'||row.submitState=='待提交'||!row.submitState
            }
          }, {
            id: 'handleApproval',
@@ -299,7 +299,7 @@
            type: 'text',
            method: 'handleApproval',
            disabFun: (row, index) => {
                        return row.ratifyState=='通过'||row.submitState=='待提交'
                        return row.ratifyState=='通过'||row.submitState=='待提交'||!row.submitState
            }
          }],
          tagField: {},
@@ -325,12 +325,18 @@
            id: 'handleAdd0',
            font: '修改',
            type: 'text',
            method: 'handleAdd0'
            method: 'handleAdd0',
            disabFun:(row, index) => {
              return !this.addPower||this.currentInfo.examineState=='通过'
            }
          },{
            id: 'delete',
            font: '删除',
            type: 'text',
            method: 'doDiy'
            method: 'doDiy',
            disabFun:(row, index) => {
              return !this.addPower||this.currentInfo.examineState=='通过'
            }
          }],
          tagField: {},
          selectField: {},
@@ -350,6 +356,17 @@
      outPower:true,
      addPower:true,
    };
  },
  watch: {
    'activeName' (val1, val2) {
      if(val1=='填写'){
        this.componentData0.do.forEach((item)=>{
          item.disabFun = (row, index) => {
            return !this.addPower||this.currentInfo.examineState=='通过'
          }
        })
      }
    }
  },
  mounted() {
    this.entityCopy = this.HaveJson(this.componentData.entity);
@@ -503,6 +520,7 @@
      // console.log(row)
      // this.title0 = '查看'
      // this.commonFun(row)
      this.currentInfo = row
      this.activeName = '填写'
      this.componentData0.entity.totalSampleId = row.id
      this.$nextTick(()=>{
@@ -600,6 +618,13 @@
      link.href = url;
      link.download = row.month+' 样品接收表';
      link.click();
    },
    tabClick(e){
      console.log(e)
      if(e.index==0){
        this.currentInfo = this.$refs['ValueTable'].tableData[0]
        this.componentData0.entity.totalSampleId=''
      }
    }
  },
}

 src/components/view/a8-external-document-confirmation-records.vue

@@ -4,17 +4,17 @@
    <el-row class="title">
      <el-col :span="20" style="padding-left: 20px;text-align: left;">外来文件确认记录</el-col>
    </el-row>
    <el-tabs type="border-card" v-model="activeName" style="height: 100%;">
    <el-tabs type="border-card" v-model="activeName" style="height: 100%;" @tab-click="tabClick">
      <el-tab-pane label="填写" name="填写" style="height: 100%;">
        <div style="display: flex;align-items: center;justify-content: flex-end;margin-right: 20px;">
          <el-button size="small" type="primary" @click="handleAdd0" style="margin-left: 20px;" v-if="addPower">新增</el-button>
          <el-button size="small" type="primary" @click="handleAdd0" style="margin-left: 20px;" v-if="addPower&&!currentInfo.ratifyUserName">新增</el-button>
          <el-upload :action="action" :multiple="false"
              :show-file-list="false"
          accept='.doc,.docx' :headers="headers" :on-change="beforeUpload"
          :on-error="onError" ref='upload' v-if="upPower" :on-success="handleSuccessUp" style="display:inline-block;margin-left: 20px;">
          :on-error="onError" ref='upload' v-if="upPower&&!currentInfo.ratifyUserName" :on-success="handleSuccessUp" style="display:inline-block;margin-left: 20px;">
          <el-button size="small" type="primary" :loading="upLoading">导入</el-button></el-upload>
        </div>
        <div class="table" style="height: calc(100% - 200px)" v-if="activeName=='历史记录'">
        <div class="table" style="height: calc(100% - 200px)" v-if="activeName=='填写'">
          <ValueTable ref="ValueTable0" :url="$api.manageRecordTotal.pageManageRecordVerify"
      :componentData="componentData0" :key="upIndex0" :delUrl="$api.manageRecordTotal.delManageRecordVerify" :upUrl="$api.manageRecordTotal.doManageRecordVerify" />
        </div>
@@ -37,7 +37,7 @@
            <el-button size="small" type="primary" @click="refreshTable()">查 询</el-button>
          </div>
        </div>
        <div class="table">
        <div class="table" v-if="activeName=='历史记录'">
          <ValueTable ref="ValueTable" :url="$api.manageRecordTotal.pageManageRecordTotal"
            :componentData="componentData" :key="upIndex"/>
        </div>
@@ -69,7 +69,7 @@
  data(){
    return{
      title0:'查看',
      activeName:'填写',
      activeName:'历史记录',
      lookDialogVisible:false,
      noCheckLoading:false,
      checkLoading:false,
@@ -141,12 +141,18 @@
            id: 'update',
            font: '修改',
            type: 'text',
            method: 'doDiy'
            method: 'doDiy',
            disabFun:(row, index) => {
              return !this.addPower||!!this.currentInfo.ratifyUserName
            }
          },{
            id: 'delete',
            font: '删除',
            type: 'text',
            method: 'doDiy'
            method: 'doDiy',
            disabFun:(row, index) => {
              return !this.addPower||!!this.currentInfo.ratifyUserName
            }
          }],
          tagField: {},
          selectField: {},
@@ -174,6 +180,17 @@
    },
    action() {
      return this.javaApi +this.$api.manageRecordTotal.exportManageRecordVerify
    }
  },
  watch: {
    'activeName' (val1, val2) {
      if(val1=='填写'){
        this.componentData0.do.forEach((item)=>{
          item.disabFun = (row, index) => {
            return !this.addPower||!!this.currentInfo.ratifyUserName
          }
        })
      }
    }
  },
  mounted() {
@@ -332,6 +349,11 @@
        this.lookDialogVisible = false
      }).catch(err=>{});
    },
    tabClick(e){
      if(e.index==0){
        this.currentInfo = this.$refs['ValueTable'].tableData[0]
      }
    }
  }
}
</script>

 src/components/view/a8-periodic-document-review-records.vue

@@ -12,7 +12,7 @@
        <el-button size="medium" type="primary" @click="handleDown" :loading="outLoading" v-if="outPower" style="display:inline-block;margin-left: 20px;">导出</el-button>
      </el-col> -->
    </el-row>
    <el-tabs type="border-card" v-model="activeName" style="height: 100%;">
    <el-tabs type="border-card" v-model="activeName" style="height: 100%;" @tab-click="tabClick">
      <el-tab-pane label="填写" name="填写" style="height: 100%;">
        <div class="search">
          <div class="search_thing">
@@ -32,11 +32,11 @@
            <el-button size="small" type="primary" @click="refreshTable()">查 询</el-button>
          </div>
          <div class="btns">
            <el-button size="medium" type="primary" @click="openAdd" v-if="addPower">新增</el-button>
            <el-button size="medium" type="primary" @click="openAdd" v-if="addPower&&!currentInfo.ratifyUserName">新增</el-button>
            <el-upload :action="action" :multiple="false"
              :show-file-list="false"
              accept='.doc,.docx' :headers="headers" :on-change="beforeUpload"
              :on-error="onError" ref='upload' v-if="upPower" :on-success="handleSuccessUp" style="display:inline-block;margin-left: 20px;">
              :on-error="onError" ref='upload' v-if="upPower&&!currentInfo.ratifyUserName" :on-success="handleSuccessUp" style="display:inline-block;margin-left: 20px;">
              <el-button type="primary" size="medium">导入</el-button></el-upload>
          </div>
        </div>
@@ -161,7 +161,7 @@
  },
  data() {
    return {
      activeName:'填写',
      activeName:'历史记录',
      title0:'新增',
      addPower:true,
      outPower:true,
@@ -189,12 +189,18 @@
          font: '删除',
          type: 'text',
          method: 'doDiy',
          disabFun:(row, index) => {
            return !this.addPower||!!this.currentInfo.ratifyUserName
          }
        }, {
          id: 'handleEdit',
          font: '修改',
          type: 'text',
          method: 'handleEdit',
          field:[],
          disabFun:(row, index) => {
            return !this.addPower||!!this.currentInfo.ratifyUserName
          }
        }],
        tagField: {
          // documentType:{
@@ -293,6 +299,17 @@
    },
    action() {
      return this.javaApi +this.$api.manageRecordIntervals.exportInManageRecordIntervals
    }
  },
  watch: {
    'activeName' (val1, val2) {
      if(val1=='填写'){
        this.componentData.do.forEach((item)=>{
          item.disabFun = (row, index) => {
            return !this.addPower||!!this.currentInfo.ratifyUserName
          }
        })
      }
    }
  },
  mounted() {
@@ -541,6 +558,11 @@
      this.title0 = '批准'
      this.commonFun(row)
    },
    tabClick(e){
      if(e.index==0){
        this.currentInfo = this.$refs['ValueTable0'].tableData[0]
      }
    }
  }
}
</script>