licp
2024-12-24 c70e37453d06f8eb6eddeddb3085548541cd34b5
修改人员
已修改8个文件
45 ■■■■■ 文件已修改
src/components/caorui/Department/components/Plan/index.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-facilities-environment/facilities-environmental-conditions/illuminance-recording.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-facilities-environment/facilities-environmental-conditions/power-supply-stability.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-personnel-training/AddInDetail.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-personnel-training/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/a6-personnel/training-record.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/a6-standard-material-requisition.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/a7-contract-review.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/caorui/Department/components/Plan/index.vue
@@ -46,8 +46,8 @@
                        <el-date-picker v-model="yearDetailForm.date" class="date_box" format="yyyy-MM-dd" placeholder="选择日期"
                            size="small" type="date" value-format="yyyy-MM-dd">
                        </el-date-picker>
                        <span>监督项目</span>
                        <el-input v-model="yearDetailForm.project" class="search" placeholder="请输入" size="small"></el-input>
                        <!-- <span>监督项目</span> -->
                        <!-- <el-input v-model="yearDetailForm.superviseDes" class="search" placeholder="请输入" size="small"></el-input> -->
                        <el-button size="small" type="primary" @click="getYearDetailPlanList">查询</el-button>
                        <el-button size="small" @click="clearDetail">清空</el-button>
                    </div>
@@ -193,8 +193,7 @@
                }],
            yearLoading: false,
            yearDetailForm: {
                date: undefined,
                project: undefined
                date: undefined
            },
            yearDetailTableData: [],    // 年明细表
            yearDeatilPage: {
@@ -310,7 +309,6 @@
        // 清除明细
        clearDetail() {
            this.yearDetailForm.date = undefined
            this.yearDetailForm.project = undefined
            this.getYearDetailPlanList()
        },
@@ -326,8 +324,7 @@
                    planId: this.planId,
                    current: this.yearDeatilPage.curent,
                    size: this.yearDeatilPage.pageSize,
                    date: this.yearDetailForm.date,
                    project: this.yearDetailForm.project
                    date: this.yearDetailForm.date
                }
            })
            if (code == 200) {
@@ -412,7 +409,7 @@
        },
      // 年度计划表-下载
      downLoadPost(row) {
        this.$axios.get(exportSuperVisePlanApi + '?id=' + row.id,{responseType: "blob"}).then(res => {
        this.$axios.post(exportSuperVisePlanApi ,{id:row.id},{responseType: "blob"}).then(res => {
          this.outLoading = false
          const blob = new Blob([res],{ type: 'application/msword' });
          //将Blob 对象转换成字符串
src/components/do/a6-facilities-environment/facilities-environmental-conditions/illuminance-recording.vue
@@ -289,7 +289,7 @@
    },
    openDialog() {
      this.$axios.get(this.$api.deviceScope.treeDevice).then(res => {
        this.cascaderList = res.data;
        this.cascaderList = res.data
      });
      this.$nextTick(() => {
        this.$refs['form'].clearValidate()
src/components/do/a6-facilities-environment/facilities-environmental-conditions/power-supply-stability.vue
@@ -255,7 +255,7 @@
    // 电源稳定性-打开弹框调用设备接口,查询使用的设备
    openDialog() {
      this.$axios.get(this.$api.deviceScope.treeDevice).then(res => {
        this.cascaderList = res.data;
        this.cascaderList = res.data
      });
      this.$nextTick(() => {
        this.$refs['form'].clearValidate()
src/components/do/a6-personnel-training/AddInDetail.vue
@@ -73,6 +73,11 @@
                <el-input v-model="trainingPlan.holdingDepartment" placeholder="请输入" size="small"></el-input>
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item label="备注:">
                <el-input v-model="trainingPlan.remarks" placeholder="请输入" size="small"></el-input>
              </el-form-item>
            </el-col>
          </el-row>
        </el-form>
      </div>
src/components/do/a6-personnel-training/index.vue
@@ -401,11 +401,13 @@
          label: '课时',
          prop: 'classHour',
          width: '100px',
        }, {
        },
        {
          label: '备注',
          prop: 'remarks',
          width: '100px',
        }, {
        },
        {
          dataType: 'action',
          width: '180',
          label: '操作',
src/components/do/a6-personnel/training-record.vue
@@ -164,10 +164,12 @@
        }, {
          label: '培训内容',
          prop: 'trainingContent'
        }, {
          label: '培训课时',
          prop: 'educationBackground'
        }, {
        },
        // {
        //   label: '培训课时',
        //   prop: 'educationBackground'
        // },
        {
          label: '课时',
          prop: 'classHour'
        }, {
src/components/view/a6-standard-material-requisition.vue
@@ -54,7 +54,7 @@
    return {
      searchForm: {
        name: '',
        factoryManufacturer: '',
        model: '',
      },
      tableColumn: [
        {
src/components/view/a7-contract-review.vue
@@ -44,11 +44,10 @@
      :visible.sync="addDialogVisible"
      width="400px">
      <el-row>
        <el-col :span="24" style="margin-bottom: 16px;">
        <!-- <el-col :span="24" style="margin-bottom: 16px;">
          <div class="search_thing">
            <div class="search_label">判定规则:</div>
            <div class="search_input" style="display: flex;align-items: center;">
              <!-- <el-input size="small" placeholder="请输入" clearable v-model="addInfo.rule"></el-input> -->
              <el-radio-group v-model="addInfo.rule" size="small" style="width: 60%;">
                <el-radio label="不考虑不确定度">不考虑不确定度</el-radio>
                <el-radio label="考虑不确定度">考虑不确定度</el-radio>
@@ -57,7 +56,7 @@
              <span v-if="addInfo.rule=='考虑不确定度'"> %</span>
            </div>
          </div>
        </el-col>
        </el-col> -->
        <el-col :span="24" style="margin-bottom: 16px;">
          <div class="search_thing">
            <div class="search_label">综合室签名人:</div>