Merge branch 'feature_1.0'

quanyawei

2023-11-14 79406a48bdad7665d1bd5ebfd07ed2dcdcf4114b

Merge branch 'feature_1.0'

 src/views/toCarryOutLegislativeReforms/components/newWorkOrder.vue

@@ -6,7 +6,7 @@
        <div>{{ title }}</div>
      </div>
      <div>
        <el-form ref="ruleForm" :disabled="pageState==='detail'" label-width="100px" :model="formData" class="demo-form-inline" :rules="rules">
        <el-form ref="ruleForm" :disabled="pageState === 'detail'" label-width="120px" :model="formData" class="demo-form-inline" :rules="rules">
          <el-row>
            <el-col :span="12">
              <el-form-item label="上报时间：" prop="escalationTime" class="span">
@@ -68,8 +68,17 @@
            <el-col :span="24">
              <el-form-item label="排查方式：" prop="investigationType" class="span">
                <el-radio-group v-model="formData.investigationType" size="small">
                  <el-radio v-for="(item) in Dic.investigationEnum" :key="item.value" :label="item.value">{{ item.name }}</el-radio>
                  <el-radio v-for="item in Dic.investigationEnum" :key="item.value" :label="item.value">{{ item.name }}</el-radio>
                </el-radio-group>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="24">
              <el-form-item label="重点任务分类：" prop="keyPoint" class="span">
                <el-checkbox-group v-model="formData.keyPoint" :max="1" size="small">
                  <el-checkbox v-for="item in Dic.emphasisEnum" :label="item.value" :key="item.value">{{ item.name }}</el-checkbox>
                </el-checkbox-group>
              </el-form-item>
            </el-col>
          </el-row>
@@ -83,7 +92,9 @@
              <div>
                <div v-if="pageState==='edit'">
                  <div v-for="(file,index) in fileBaseListCover" :key="file.fileId+index" class="block">
                    <el-image v-if="file.fileType ===1" style="width: 100px; height: 100px" :src="file.url" :preview-src-list="getPreviewImages(file.fileId,fileBaseList)" :initial-index="index" />
                    <el-image v-if="file.fileType === 1" style="width: 100px; height: 100px" :src="file.url" :preview-src-list="
                        getPreviewImages(file.fileId, fileBaseList)
                      " :initial-index="index" />
                    <video v-else :src="file.url" style="width: 100px; height: 100px" @click="openVideo(file)">
                      您的浏览器不支持 video 标签。
                    </video>
@@ -102,7 +113,7 @@
      </div>
    </el-dialog>
    <el-dialog :visible.sync="videoVisible" width="600px" :modal-append-to-body="false" :destroy-on-close="true" @close="handleCancel">
      <div style="text-align: center;">
      <div style="text-align: center">
        <video ref="video" style="width: 300px;height: 500px" :src="dialogImageUrl" controls autoplay />
      </div>
    </el-dialog>
@@ -133,6 +144,7 @@
        escalationTime: new Date(),
        fileBaseList: [],
        escalationName: '',
        keyPoint: [],
        changeDay: 0,
        investigationType: 1
      },
@@ -284,6 +296,9 @@
        if (!(JSON.stringify(this.parentFormData) === '{}')) {
          this.formData = this.parentFormData
          this.formData.polluteType = String(this.parentFormData.polluteType)
          this.formData.keyPoint = this.parentFormData.keyPoint
            ? [Number(this.parentFormData.keyPoint)]
            : []
        } else {
          const name = this.$store.state.user.name
          this.formData.escalationName = name
@@ -311,6 +326,8 @@
        })
      }
      this.formData.state = val
      this.formData.keyPoint =
        this.formData.keyPoint.length > 0 ? this.formData.keyPoint[0] : ''
      this.$refs.ruleForm.validate(valid => {
        if (valid) {
          // this.formData.fileBaseList = [...this.parentFormData.fileBaseList, this.formData.fileBaseList]

 src/views/toCarryOutLegislativeReforms/components/queryForm.vue

@@ -35,13 +35,13 @@
          </el-select>
        </el-form-item>
        <el-form-item label="流程状态：">
          <el-select v-model="formData.state" size="small" clearable multiple collapse-tags placeholder="请选择">
          <el-select v-model="formData.state" size="small" clearable multiple collapse-tags placeholder="请选择" @change="replacePerChange($event)">
            <el-option v-for="item in Dic.allocationApproveEnum" :key="item.value" :label="item.name" :value="item.value" />
          </el-select>
        </el-form-item>

        <el-form-item label="是否作废：">
          <el-select v-model="formData.isInvalid " placeholder="请选择" clearable size="small">
          <el-select v-model="formData.isInvalid " placeholder="请选择" clearable size="small" @change="replacePerChange($event)">
            <el-option v-for="item in Dic.yesOrNo" :key="item.value" :label="item.name" :value="item.value" />
          </el-select>
        </el-form-item>
@@ -62,7 +62,8 @@
  data() {
    return {
      formData: {
        isInvalid: null
        isInvalid: 0,
        state: [9, 20, 30]
      },
      unitList: [],
      Dic: JSON.parse(localStorage.getItem('dict')),
@@ -84,7 +85,6 @@
        method: 'get'
      }).then(res => {
        this.unitList = res.data
        this.formData.isInvalid = 0
      })
    },
    getContaminateList() {
@@ -95,6 +95,9 @@
        this.polluteList = res.data
      })
    },
    replacePerChange(val) {
      this.$forceUpdate()
    },
    onSubmit() {
      console.log('formData', this.formData)
      this.$emit('handleSearch', this.formData)

 src/views/toCarryOutLegislativeReforms/components/workOrderInformation.vue

@@ -12,7 +12,7 @@
          </el-steps>
        </div>
        <div class="inforData">
          <el-descriptions title="基本信息">
          <el-descriptions title="基本信息" :column="parseInt('4')">
            <el-descriptions-item label="上报时间" label-class-name="itemSpan">{{ parentFormData.escalationTime }}</el-descriptions-item>
            <el-descriptions-item label="责任单位" label-class-name="itemSpan">{{ unitIdFormatter }}</el-descriptions-item>
            <el-descriptions-item label="污染分类" label-class-name="itemSpan">{{ polluteTypeFormatter }}</el-descriptions-item>
@@ -20,7 +20,10 @@
            <el-descriptions-item label="期限天数" label-class-name="itemSpan">{{ parentFormData.changeDay }}</el-descriptions-item>
            <el-descriptions-item label="上报单位" label-class-name="itemSpan">{{ updataUnitIdFormatter }}</el-descriptions-item>
            <el-descriptions-item label="上报人" label-class-name="itemSpan">{{ parentFormData.escalationName }}</el-descriptions-item>
          </el-descriptions>
          <el-descriptions :column="parseInt('2')">
            <el-descriptions-item label="污染位置" label-class-name="itemSpan">{{ parentFormData.pollutePosition }}</el-descriptions-item>
            <el-descriptions-item label="重点任务" label-class-name="itemSpan">{{ dictObj.emphasisEnum[parentFormData.keyPoint]  }}</el-descriptions-item>
          </el-descriptions>
          <el-descriptions :column="parseInt('1')">
            <el-descriptions-item label="问题描述" label-class-name="itemSpan" :content-style="{'width': '80%'}">{{ parentFormData.problemDescribe }}</el-descriptions-item>

 src/views/toCarryOutLegislativeReforms/reform/index.vue

@@ -203,7 +203,7 @@
        // 总条数，根据接口获取数据长度(注意：这里不能为空)
        totalCount: 0,
        // 个数选择器（可修改）
        pageSizes: [10, 20, 30, 40],
        pageSizes: [10, 30, 60, 100],
        // 默认每页显示的条数（可修改）
        pageSize: 10
      },
@@ -459,7 +459,7 @@
        // 总条数，根据接口获取数据长度(注意：这里不能为空)
        totalCount: 0,
        // 个数选择器（可修改）
        pageSizes: [10, 20, 30, 40],
        pageSizes: [10, 30, 60, 100],
        // 默认每页显示的条数（可修改）
        pageSize: 10
      }