Default Changelist

马宇豪

2024-08-16 3b75798cc41993f9016610296907d2338545a345

 src/views/newSpecialWorkSystem/workTicket/wdsq/components/fireDialog.vue

@@ -301,8 +301,8 @@
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="完工验收" prop="acceptUid">
              <el-select v-model="form.acceptUid" filterable clearable>
            <el-form-item label="完工验收" prop="acceptUids">
              <el-select v-model="form.acceptUids" filterable multiple clearable>
                <el-option
                    v-for="item in lists.workerList"
                    :key="item.uid"
@@ -327,21 +327,20 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12">
            <el-form-item label="最终审批人" prop="lastApprover">
              <el-select v-model="form.lastApprover" filterable clearable>
                <el-option
                    v-for="item in lists.workerList"
                    :key="item.uid"
                    :label="item.username"
                    :value="item.uid"
                />
              </el-select>
<!--              <el-cascader style="width: 100%" v-model="form.lastApprover" :options="lists.workerList" :props="cas4Props" filterable :show-all-levels="false"/>-->
            </el-form-item>
          </el-col>
        </el-row>
<!--        <el-row>-->
<!--          <el-col :span="12">-->
<!--            <el-form-item label="最终审批人" prop="lastApprover">-->
<!--              <el-select v-model="form.lastApprover" filterable clearable>-->
<!--                <el-option-->
<!--                    v-for="item in lists.workerList"-->
<!--                    :key="item.uid"-->
<!--                    :label="item.username"-->
<!--                    :value="item.uid"-->
<!--                />-->
<!--              </el-select>-->
<!--            </el-form-item>-->
<!--          </el-col>-->
<!--        </el-row>-->
         </div>
      </el-form>
      <div class="applyBtn">
@@ -408,7 +407,7 @@
          involveOtherWork: [],
          safetyMeasureUids: [],
          approvalDepBasicList: [],
          acceptUid: null,
          acceptUids: [],
          lastApprover: null,
          startOrEndUids: [],
          cameraIds: [],
@@ -510,7 +509,7 @@
        expStartTime: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
        expEndTime: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
        safetyMeasureUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
        acceptUid: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
        acceptUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
        lastApprover: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
        startOrEndUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
        "workDetail.methodList": [{ required: true, message: '该内容不能为空', trigger: 'blur' }],
@@ -557,10 +556,9 @@
          approvalUids: item.approvalPersonList.filter(j=>j.type == 5).map(i=>i.userId),
          approvalType: item.approvalType
        }))
        console.log(state.form.approvalDepBasicList,777)
        state.form.acceptUid = row.acceptUser.userId
        state.form.acceptUids = row.acceptUserList.map(i=>i.userId)
        state.form.startOrEndUids = row.startOrEndList.map(i=>i.userId)
        state.form.lastApprover = row.lastApprover.userId
        // state.form.lastApprover = row.lastApprover.userId
        state.form.workDetail.methodList = state.form.workDetail.workMethod.split(',')
        if(row.workDepList && row.workDepList.length>0){
          state.form.workDepIds = row.workDepList.map(i=>i.workDepId)
@@ -597,7 +595,7 @@
          involveOtherWork: [],
          safetyMeasureUids: [],
          approvalDepBasicList: [],
          acceptUid: null,
          acceptUids: [],
          lastApprover: null,
          startOrEndUids: [],
          cameraIds: [],
@@ -739,7 +737,7 @@
            data.guardianUids = transform2Arr(data.guardianUids)
            data.safetyMeasureUids = transform2Arr(data.safetyMeasureUids)
            data.startOrEndUids = transform2Arr(data.startOrEndUids)
            data.acceptUid = transform2EObj(data.acceptUid)
            data.acceptUids = transform2Arr(data.acceptUids)
            data.lastApprover = transform2EObj(data.lastApprover)
            const res = await workApplyApi().modFireApply(data)
            if (res.data.code === '200') {