diff --git a/sgzb-ui/.prettierrc b/sgzb-ui/.prettierrc
deleted file mode 100644
index d6d4baf0..00000000
--- a/sgzb-ui/.prettierrc
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "printWidth": 120,
-  "tabWidth": 2,
-  "singleQuote": true,
-  "semi": false,
-  "bracketSpacing": true,
-  "jsxBracketSameLine": true,
-  "arrowParens": "avoid",
-  "endOfLine": "lf",
-  "useTabs": false,
-  "trailingComma": "es5",
-  "bracketSameLine": false,
-  "htmlWhitespaceSensitivity": "ignore",
-  "vueIndentScriptAndStyle": false,
-  "singleAttributePerLine": false
-  }
\ No newline at end of file
diff --git a/sgzb-ui/package.json b/sgzb-ui/package.json
index cc57ca39..0f2820f8 100644
--- a/sgzb-ui/package.json
+++ b/sgzb-ui/package.json
@@ -6,7 +6,7 @@
     "license": "MIT",
     "scripts": {
         "dev": "vue-cli-service serve",
-        "build": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+        "build": "vue-cli-service build",
         "build:stage": "vue-cli-service build --mode staging",
         "preview": "node build/index.js --preview",
         "lint": "eslint --ext .js,.vue src"
diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
index 5cb88d2e..a3b7400b 100644
--- a/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
@@ -94,630 +94,6 @@
       </el-col> -->
     </el-row>
 
-    <<<<<<< HEAD
-    <el-table v-loading="loading" :data="leaseApplyDetails" @selection-change="handleSelectionChange">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="序号" type="index" width="80" />
-      <el-table-column label="类型名称" prop="typeCn" :show-overflow-tooltip="true" />
-      <el-table-column label="规格型号" prop="guigeCn" :show-overflow-tooltip="true" />
-      <el-table-column label="计量单位" prop="unitCn" />
-      <el-table-column label="库存数量" prop="num" />
-      <el-table-column label="预领数量" align="center">
-        <template slot-scope="scope">
-          <el-input
-            v-model.number="scope.row.preNum"
-            placeholder="请输入预领数量"
-            type="number"
-            min="1"
-            @input="checkNum(scope.row)"
-            clearable
-            style="width: 100%"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center">
-        <template slot-scope="scope">
-          <el-input maxlength="100" v-model="scope.row.remark" placeholder="请输入备注" clearable style="width: 100%" />
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        fixed="right"
-        class-name="small-padding fixed-width"
-        v-if="isEdit == 'true'"
-      >
-        <template slot-scope="scope">
-          <!--          <el-button-->
-          <!--            size="mini"-->
-          <!--            type="text"-->
-          <!--            icon="el-icon-edit"-->
-          <!--            @click="handleBack(scope.row)"-->
-          <!--            v-hasPermi="['system:role:edit']"-->
-          <!--          >修改</el-button>-->
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete({ ...scope.row, index: scope.$index })"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script>
-    import {
-        getRole,
-        delRole,
-        addRole,
-        updateRole,
-        dataScope,
-        changeRoleStatus,
-        deptTreeSelect,
-    } from '@/api/system/role'
-    import {
-        treeselect as menuTreeselect,
-        roleMenuTreeselect,
-    } from '@/api/system/menu'
-    import {
-        getProData,
-        getUnitData,
-        getDeviceTypeTree,
-        getAgreementInfoById,
-        submitLeaseApply,
-        getLeaseListAll,
-        editLeaseApply,
-        getLeaseApplyListAll,
-        getLeaseApplyAuditListAll,
-    } from '@/api/claimAndRefund/receive'
-    import { getInfo } from '@/api/login'
-    export default {
-        name: 'ReceiveApplyAdd',
-        data() {
-            const validatePhone = (rule, value, callback) => {
-                if (!value) {
-                    callback(new Error('退料人电话不能为空'))
-                    // this.$message.error("手机号不为空");
-                } else if (value.length < 11) {
-                    callback(new Error('电话号码格式不正确'))
-                    // this.$message.error("手机号格式不正确");
-                } else {
-                    callback()
-                }
-            }
-            return {
-                user: null, // 用户信息
-                // 遮罩层
-                loading: false,
-                // 选中数组
-                ids: [],
-                // 非单个禁用
-                single: true,
-                // 非多个禁用
-                multiple: true,
-                // 显示搜索条件
-                showSearch: true,
-                // 总条数
-                total: 0,
-                // 角色表格数据
-                roleList: [],
-                // 弹出层标题
-                title: '',
-                // 是否显示弹出层
-                open: false,
-                // 是否显示弹出层（数据权限）
-                openDataScope: false,
-                menuExpand: false,
-                menuNodeAll: false,
-                deptExpand: true,
-                deptNodeAll: false,
-                isEdit: 'true',
-                // 日期范围
-                dateRange: [],
-                // 数据范围选项
-                dataScopeOptions: [
-                    {
-                        value: '1',
-                        label: '全部数据权限',
-                    },
-                    {
-                        value: '2',
-                        label: '自定数据权限',
-                    },
-                    {
-                        value: '3',
-                        label: '本部门数据权限',
-                    },
-                    {
-                        value: '4',
-                        label: '本部门及以下数据权限',
-                    },
-                    {
-                        value: '5',
-                        label: '仅本人数据权限',
-                    },
-                ],
-                // 菜单列表
-                menuOptions: [],
-                // 部门列表
-                deptOptions: [],
-                // 查询参数
-                queryParams: {
-                    types: 2,
-
-                    unitId: null,
-                    proId: null,
-                    agreementId: null, //协议id
-                    agreementCode: null, //协议code
-                    companyId: '', //登录信息中取
-                    createBy: '', //用户名
-                    taskType: 29,
-                    taskStatus: 30,
-                    //领料人信息
-                    leaseApplyInfo: {
-                        leasePerson: '',
-                        phone: '',
-                        remark: '',
-                    },
-                    //领料详情集合
-                    leaseApplyDetails: [],
-                },
-                leaseApplyDetails: [],
-
-                leaseApplyInfoList: [],
-
-                //领料详情单条模板
-                leaseApplyDetailsItem: {
-                    parenntId: null,
-                    createBy: null,
-                    companyId: null,
-                    status: 0,
-                    typeId: null, //  树结构第4级   规格id
-                    typeCn: '', //显示的设备类型
-                    guigeCn: '', //显示的设备规格
-                    unitCn: '', //显示的设备 单位
-                    remark: '', //单条备注
-                    preNum: 1, //预领数量
-                },
-                //
-                queryRules: {
-                    unitId: [
-                        {
-                            required: true,
-                            message: '请选择来往单位',
-                            trigger: 'change',
-                            type: 'number',
-                        },
-                    ],
-                    proId: [
-                        {
-                            required: true,
-                            message: '请选择工程',
-                            trigger: 'change',
-                            type: 'number',
-                        },
-                    ],
-                    // leasePerson: [
-                    //   {
-                    //     required: true, message: '请输入领料人', trigger: 'blur',
-                    //   }
-                    // ],
-                    // phone: [
-                    //     {required: true, message: '请输入领料人手机号', trigger: 'change'},
-                    //     { validator: validatePhone, trigger: "blur" },
-                    //     { min: 11, message: "手机号不足11位", trigger: "blur" },
-                    // ],
-                },
-                unitList: [], //单位 集合
-                proList: [], // 工程 集合
-                deviceTypeTree: [], // 设备 树结构数据
-
-                taskId: null, // 是否编辑
-
-                // 设备 树显示 配置
-                deviceTypeTreeProps: {
-                    multiple: false,
-                    value: 'id',
-                },
-                // 选中的设备类型
-                deviceType: null,
-
-                // 表单参数
-                form: {},
-                defaultProps: {
-                    children: 'children',
-                    label: 'label',
-                },
-                // 表单校验
-                rules: {
-                    roleName: [
-                        {
-                            required: true,
-                            message: '角色名称不能为空',
-                            trigger: 'blur',
-                        },
-                    ],
-                    roleKey: [
-                        {
-                            required: true,
-                            message: '权限字符不能为空',
-                            trigger: 'blur',
-                        },
-                    ],
-                    roleSort: [
-                        {
-                            required: true,
-                            message: '角色顺序不能为空',
-                            trigger: 'blur',
-                        },
-                    ],
-                },
-            }
-        },
-        created() {
-            this.GetUserInfo()
-
-            this.GetUnitData()
-
-            this.GetProData()
-
-            this.GetDeviceTypeTree()
-            // this.getList();
-            if (this.$route.query.taskId && !this.$route.query.isBack) {
-                this.GetTaskDetail(this.$route.query.taskId)
-            }
-            if (this.$route.query.taskId && this.$route.query.isBack) {
-                this.GetTaskDetail2(this.$route.query.taskId)
-            }
-            this.taskId = this.$route.query.taskId
-            this.isEdit = this.$route.query.isEdit
-            // console.log(typeof(this.isEdit))
-            // this.$set('isEdit',this.$route.query.isEdit)
-        },
-
-        methods: {
-            // 获取用户信息
-            async GetUserInfo() {
-                const res = await getInfo()
-                this.user = res.user
-            },
-
-            // 获取 来往单位 列表数据
-            async GetUnitData() {
-                const params = {
-                    id: this.queryParams.proId,
-                }
-                const res = await getUnitData(params)
-                this.unitList = res.data
-
-                this.GetAgreementInfoById()
-            },
-            // 获取 工程名称 列表数据
-            async GetProData() {
-                const params = {
-                    id: this.queryParams.unitId,
-                }
-                const res = await getProData(params)
-                this.proList = res.data
-
-                this.GetAgreementInfoById()
-            },
-
-            // 获取 设备树结构数据
-            async GetDeviceTypeTree() {
-                const params = {
-                    level: 4,
-                }
-                const res = await getDeviceTypeTree(params)
-                this.deviceTypeTree = res.data
-            },
-            // 获取 协议id
-            async GetAgreementInfoById() {
-                if (this.queryParams.unitId && this.queryParams.proId) {
-                    const params = {
-                        unitId: this.queryParams.unitId,
-                        projectId: this.queryParams.proId,
-                    }
-                    const res = await getAgreementInfoById(params)
-                    if (!(res.data && res.data.agreementId)) {
-                        this.$message.error('当前单位和工程未上传')
-
-                        this.queryParams.unitId = null
-                        this.queryParams.proId = null
-                        this.GetUnitData()
-                        this.GetProData()
-                    } else {
-                        this.queryParams.agreementId = res.data.agreementId
-                        this.queryParams.agreementCode = res.data.agreementCode
-                    }
-                }
-            },
-
-            // 获取 任务详情数据
-            async GetTaskDetail(taskId) {
-                const res = await getLeaseApplyListAll({ taskId })
-
-                const data = res.rows[0]
-
-                // unitId:null,
-                // proId:null,
-                // agreementId:null, //协议id
-                // agreementCode: null,
-                if (data.taskStatus == 100) {
-                    this.queryParams.taskStatus = 32
-                    this.queryParams.examineStatusId = '32'
-                }
-                this.queryParams.unitId = data.unitId
-                this.queryParams.proId = data.proId
-                this.queryParams.leaseApplyInfo.phone =
-                    data.leaseApplyInfoList[0].phone
-                this.queryParams.leaseApplyInfo.leasePerson =
-                    data.leaseApplyInfoList[0].leasePerson
-                this.queryParams.agreementCode = data.agreementCode
-                this.queryParams.agreementId = data.agreementId
-                this.queryParams.leaseApplyInfo.remark =
-                    data.leaseApplyInfoList[0].remark
-                this.leaseApplyInfoList = data.leaseApplyInfoList
-                this.leaseApplyDetails = data.leaseApplyDetails.map((item) => {
-                    return this.handelEchoData(item)
-                })
-            },
-            // 驳回提交 任务详情数据
-            async GetTaskDetail2(taskId) {
-                const res = await getLeaseApplyAuditListAll({ taskId })
-
-                const data = res.rows[0]
-
-                // unitId:null,
-                // proId:null,
-                // agreementId:null, //协议id
-                // agreementCode: null,
-                if (data.taskStatus == 100) {
-                    this.queryParams.taskStatus = 32
-                    this.queryParams.examineStatusId = '32'
-                }
-                this.queryParams.unitId = data.unitId
-                this.queryParams.proId = data.proId
-                this.queryParams.leaseApplyInfo.phone =
-                    data.leaseApplyInfoList[0].phone
-                this.queryParams.leaseApplyInfo.leasePerson =
-                    data.leaseApplyInfoList[0].leasePerson
-                this.queryParams.agreementCode = data.agreementCode
-                this.queryParams.agreementId = data.agreementId
-                this.queryParams.leaseApplyInfo.remark =
-                    data.leaseApplyInfoList[0].remark
-                this.leaseApplyInfoList = data.leaseApplyInfoList
-                this.leaseApplyDetails = data.leaseApplyDetails.map((item) => {
-                    return this.handelEchoData(item)
-                })
-            },
-            //生成回显数据
-            handelEchoData(item) {
-                const template = JSON.parse(
-                    JSON.stringify(this.leaseApplyDetailsItem),
-                )
-                template.createBy = item.createBy
-                template.companyId = item.companyId
-                template.typeId = item.typeId
-                template.unitCn = item.unitName
-                template.typeCn = item.typeName
-                template.guigeCn = item.typeModelName
-                template.remark = item.remark
-                template.preNum = item.preNum
-                template.status = item.status
-                template.parenntId = item.parenntId
-                template.num = item.num
-                return template
-            },
-
-            // 表单重置
-            reset() {
-                if (this.$refs.menu != undefined) {
-                    this.$refs.menu.setCheckedKeys([])
-                }
-                ;(this.menuExpand = false),
-                    (this.menuNodeAll = false),
-                    (this.deptExpand = true),
-                    (this.deptNodeAll = false),
-                    (this.form = {
-                        roleId: undefined,
-                        roleName: undefined,
-                        roleKey: undefined,
-                        roleSort: 0,
-                        status: '0',
-                        menuIds: [],
-                        deptIds: [],
-                        menuCheckStrictly: true,
-                        deptCheckStrictly: true,
-                        remark: undefined,
-                    })
-                this.resetForm('form')
-            },
-            /** 搜索按钮操作 */
-            handleQuery() {
-                this.queryParams.pageNum = 1
-            },
-            /** 重置按钮操作 */
-            resetQuery() {
-                this.dateRange = []
-                this.resetForm('queryForm')
-            },
-            // 多选框选中数据
-            handleSelectionChange(selection) {
-                // this.queryParams.leaseApplyDetails = selection
-                this.single = selection.length != 1
-                this.multiple = !selection.length
-            },
-            // 更多操作触发
-            handleCommand(command, row) {
-                switch (command) {
-                    case 'handleDataScope':
-                        this.handleDataScope(row)
-                        break
-                    case 'handleAuthUser':
-                        this.handleAuthUser(row)
-                        break
-                    default:
-                        break
-                }
-            },
-
-            /** 保存按钮操作 */
-            handleAdd() {
-                this.$refs.queryForm.validate(async (valid) => {
-                    if (!valid) {
-                        return false
-                    } else {
-                        this.queryParams.leaseApplyDetails =
-                            this.leaseApplyDetails
-                        if (this.queryParams.leaseApplyDetails.length == 0) {
-                            this.$message.error('请添加数据')
-                            return
-                        }
-                        this.queryParams.leaseApplyDetails.forEach((item) => {
-                            /*  if (item.num == 0) {
-                                this.$message.error(
-                                    '机具类型库存量为零无法领料',
-                                )
-                                return
-                            } */
-                            if (item.preNum == '') {
-                                this.$message.error('请填写预领数量')
-                                return
-                            }
-                        })
-                        this.queryParams.createBy = this.user.userName
-                        this.queryParams.companyId = this.user.companyId
-                        let res
-
-                        if (this.taskId) {
-                            this.leaseApplyInfoList.forEach((v) => {
-                                v = Object.assign(
-                                    v,
-                                    this.queryParams.leaseApplyInfo,
-                                )
-                                this.$set(
-                                    v,
-                                    'leaseApplyDetails',
-                                    this.queryParams.leaseApplyDetails,
-                                )
-                            })
-
-                            const params = {
-                                ...this.queryParams,
-                                taskId: this.taskId,
-                                leaseApplyInfoList: this.leaseApplyInfoList,
-                            }
-
-                            res = await editLeaseApply(params)
-                        } else {
-                            // console.log(this.queryParams)
-                            let isNum =
-                                this.queryParams.leaseApplyDetails.every(
-                                    (e) => e.num != 0,
-                                )
-
-                            if (!isNum) {
-                                this.$message.error(
-                                    '机具类型库存量为零无法领料',
-                                )
-                                return
-                            }
-                            res = await submitLeaseApply(this.queryParams)
-                        }
-                        if (res.code == 200) {
-                            this.$message({
-                                type: 'success',
-                                message: res.msg,
-                            })
-                            this.$tab.closeOpenPage({
-                                path: '/claimAndRefund/receive/receiveApply',
-                            })
-                        }
-                    }
-                })
-            },
-            /** 修改按钮操作 */
-            handleBack(row) {
-                this.$tab.closeOpenPage({
-                    path: '/claimAndRefund/receive/receiveApply',
-                })
-            },
-            /** 删除按钮操作 */
-            handleDelete(row) {
-                this.leaseApplyDetails.splice(row.index, 1)
-            },
-            /** 导出按钮操作 */
-            handleExport() {
-                // this.download('system/role/export', {
-                //   ...this.queryParams
-                // }, `role_${new Date().getTime()}.xlsx`)
-            },
-
-            checkNum(row) {
-                let maxNum = row.num
-                if (row.preNum <= 1) {
-                    row.preNum = 1
-                } else if (row.preNum >= maxNum) {
-                    row.preNum = maxNum
-                }
-            },
-            /////// 设备类型树  切换
-            deviceTypeChange(val) {
-                console.log(val)
-                let nodes = null
-                nodes =
-                    this.$refs.deviceTypeCascader.getCheckedNodes().length > 0
-                        ? this.$refs.deviceTypeCascader.getCheckedNodes()
-                        : [
-                              this.$refs.deviceTypeCascader.panel.getNodeByValue(
-                                  val,
-                              ),
-                          ]
-                if (nodes[0].level != 4) {
-                    return
-                }
-                // console.log(this.leaseApplyDetails)
-                // console.log(nodes[0].data.id)
-                for (let i = 0; i < this.leaseApplyDetails.length; i++) {
-                    if (this.leaseApplyDetails[i].typeId == nodes[0].data.id) {
-                        this.leaseApplyDetails.splice(i, 1)
-                        break
-                    }
-                }
-                this.leaseApplyDetails.push(this.handelTableItemData(nodes[0]))
-                this.deviceType = {}
-            },
-            //// 将数据处理成 表格中需要的数据
-            handelTableItemData(node) {
-                const template = JSON.parse(
-                    JSON.stringify(this.leaseApplyDetailsItem),
-                )
-                template.createBy = this.user.name
-                console.log(node.data)
-                template.num = node.data.num
-                template.companyId = node.data.companyId
-                template.typeId = node.data.id
-                template.unitCn = node.data.unitName
-                template.typeCn = node.pathLabels[2]
-                template.guigeCn = node.pathLabels[3]
-
-                if (this.taskId) {
-                    const index = this.leaseApplyInfoList.find(
-                        (key) => key.companyId == node.data.companyId,
-                    )
-                    template.parenntId = index ? index.id : ''
-                }
-
-                return template
-            },
-        },
-    }
-=======
     <el-table v-loading="loading" :data="leaseApplyDetails" @selection-change="handleSelectionChange">
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="序号" type="index" width="80" />
@@ -1276,5 +652,4 @@ export default {
     },
   },
 }
->>>>>>> dev-cq-bug
 </script>
diff --git a/sgzb-ui/src/views/index.vue b/sgzb-ui/src/views/index.vue
index 87f1c310..05ba3a01 100644
--- a/sgzb-ui/src/views/index.vue
+++ b/sgzb-ui/src/views/index.vue
@@ -1,185 +1,269 @@
 <template>
-  <!-- 首页 -->
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="关键字" prop="keyWord">
-        <el-input
-          v-model="queryParams.keyWord"
-          placeholder="请输入关键字"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="待办单号" prop="taskCode">
-        <el-input
-          v-model="queryParams.taskCode"
-          placeholder="请输入待办单号"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="待办事件" prop="taskTypeId">
-        <el-select v-model="queryParams.taskTypeId" placeholder="待办事件" clearable filterable style="width: 240px">
-          <el-option
-            v-for="types in taskTypeList"
-            :key="types.taskTypeId"
-            :label="types.taskType"
-            :value="types.taskTypeId"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
+    <!-- 首页 -->
+    <div class="app-container">
+        <el-form
+            :model="queryParams"
+            ref="queryForm"
+            size="small"
+            :inline="true"
+            v-show="showSearch"
+            label-width="68px"
+        >
+            <el-form-item label="关键字" prop="keyWord">
+                <el-input
+                    v-model="queryParams.keyWord"
+                    placeholder="请输入关键字"
+                    clearable
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="待办单号" prop="taskCode">
+                <el-input
+                    v-model="queryParams.taskCode"
+                    placeholder="请输入待办单号"
+                    clearable
+                    style="width: 240px"
+                    @keyup.enter.native="handleQuery"
+                />
+            </el-form-item>
+            <el-form-item label="待办事件" prop="taskTypeId">
+                <el-select
+                    v-model="queryParams.taskTypeId"
+                    placeholder="待办事件"
+                    clearable
+                    filterable
+                    style="width: 240px"
+                >
+                    <el-option
+                        v-for="types in taskTypeList"
+                        :key="types.taskTypeId"
+                        :label="types.taskType"
+                        :value="types.taskTypeId"
+                    />
+                </el-select>
+            </el-form-item>
+            <el-form-item label="创建时间">
+                <el-date-picker
+                    v-model="dateRange"
+                    style="width: 240px"
+                    value-format="yyyy-MM-dd"
+                    type="daterange"
+                    range-separator="-"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                ></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+                <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="handleQuery"
+                    >查询</el-button
+                >
+                <el-button
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+                    >重置</el-button
+                >
+            </el-form-item>
+        </el-form>
 
-    <!--    <el-row :gutter="10" class="mb8">-->
-    <!--      <el-col :span="1.5">-->
-    <!--        <el-button-->
-    <!--          type="primary"-->
-    <!--          plain-->
-    <!--          icon="el-icon-plus"-->
-    <!--          size="mini"-->
-    <!--          @click="handleAdd"-->
-    <!--          v-hasPermi="['system:dict:add']"-->
-    <!--        >新增</el-button>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="1.5">-->
-    <!--        <el-button-->
-    <!--          type="success"-->
-    <!--          plain-->
-    <!--          icon="el-icon-edit"-->
-    <!--          size="mini"-->
-    <!--          :disabled="single"-->
-    <!--          @click="handleUpdate"-->
-    <!--          v-hasPermi="['system:dict:edit']"-->
-    <!--        >修改</el-button>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="1.5">-->
-    <!--        <el-button-->
-    <!--          type="danger"-->
-    <!--          plain-->
-    <!--          icon="el-icon-delete"-->
-    <!--          size="mini"-->
-    <!--          :disabled="multiple"-->
-    <!--          @click="handleDelete"-->
-    <!--          v-hasPermi="['system:dict:remove']"-->
-    <!--        >删除</el-button>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="1.5">-->
-    <!--        <el-button-->
-    <!--          type="warning"-->
-    <!--          plain-->
-    <!--          icon="el-icon-download"-->
-    <!--          size="mini"-->
-    <!--          @click="handleExport"-->
-    <!--          v-hasPermi="['system:dict:export']"-->
-    <!--        >导出</el-button>-->
-    <!--      </el-col>-->
-    <!--      <el-col :span="1.5">-->
-    <!--        <el-button-->
-    <!--          type="danger"-->
-    <!--          plain-->
-    <!--          icon="el-icon-refresh"-->
-    <!--          size="mini"-->
-    <!--          @click="handleRefreshCache"-->
-    <!--          v-hasPermi="['system:dict:remove']"-->
-    <!--        >刷新缓存</el-button>-->
-    <!--      </el-col>-->
-    <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
-    <!--    </el-row>-->
+        <!--    <el-row :gutter="10" class="mb8">-->
+        <!--      <el-col :span="1.5">-->
+        <!--        <el-button-->
+        <!--          type="primary"-->
+        <!--          plain-->
+        <!--          icon="el-icon-plus"-->
+        <!--          size="mini"-->
+        <!--          @click="handleAdd"-->
+        <!--          v-hasPermi="['system:dict:add']"-->
+        <!--        >新增</el-button>-->
+        <!--      </el-col>-->
+        <!--      <el-col :span="1.5">-->
+        <!--        <el-button-->
+        <!--          type="success"-->
+        <!--          plain-->
+        <!--          icon="el-icon-edit"-->
+        <!--          size="mini"-->
+        <!--          :disabled="single"-->
+        <!--          @click="handleUpdate"-->
+        <!--          v-hasPermi="['system:dict:edit']"-->
+        <!--        >修改</el-button>-->
+        <!--      </el-col>-->
+        <!--      <el-col :span="1.5">-->
+        <!--        <el-button-->
+        <!--          type="danger"-->
+        <!--          plain-->
+        <!--          icon="el-icon-delete"-->
+        <!--          size="mini"-->
+        <!--          :disabled="multiple"-->
+        <!--          @click="handleDelete"-->
+        <!--          v-hasPermi="['system:dict:remove']"-->
+        <!--        >删除</el-button>-->
+        <!--      </el-col>-->
+        <!--      <el-col :span="1.5">-->
+        <!--        <el-button-->
+        <!--          type="warning"-->
+        <!--          plain-->
+        <!--          icon="el-icon-download"-->
+        <!--          size="mini"-->
+        <!--          @click="handleExport"-->
+        <!--          v-hasPermi="['system:dict:export']"-->
+        <!--        >导出</el-button>-->
+        <!--      </el-col>-->
+        <!--      <el-col :span="1.5">-->
+        <!--        <el-button-->
+        <!--          type="danger"-->
+        <!--          plain-->
+        <!--          icon="el-icon-refresh"-->
+        <!--          size="mini"-->
+        <!--          @click="handleRefreshCache"-->
+        <!--          v-hasPermi="['system:dict:remove']"-->
+        <!--        >刷新缓存</el-button>-->
+        <!--      </el-col>-->
+        <!--      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
+        <!--    </el-row>-->
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
-      <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column label="序号" align="center" width="80" type="index">
-        <template scope="scope">
-          <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="任务单号" align="center" prop="taskCode" show-overflow-tooltip />
-      <el-table-column label="待办任务" align="center" prop="taskType" show-overflow-tooltip />
-      <el-table-column label="待办事件" align="center" prop="taskEvent"></el-table-column>
-      <el-table-column label="任务创建人" align="center" prop="createName" show-overflow-tooltip />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) || '-' }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="{ row }">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handlePreview(row.taskTypeId, row.taskCode)">
-            查 看
-          </el-button>
-
-          <!-- 代办事件为领料任务时显示催办按钮 -->
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit-outline"
-            style="color: #e6a23c"
-            v-if="row.taskTypeId == 29"
-            @click="handleUrging(row.taskTypeId, row.taskCode, row.taskEvent, row.taskId)"
-          >
-            催 办
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 催办弹框 -->
-    <el-dialog
-      title="催办"
-      :visible.sync="urgingDialogVisible"
-      width="60%"
-      append-to-body
-      :before-close="handleCloseUrgingDialog"
-    >
-      <el-form label-width="120px" label-position="right">
-        <el-form-item label="待办人：">
-          <el-row>
-            <el-tag
-              class="addressee"
-              :closable="toPersonInfo.length > 1"
-              type="info"
-              v-for="(item, v) in toPersonInfo"
-              :key="v.noticeUser"
-              @close="handleDeleteToPerson(v)"
+        <el-table
+            v-loading="loading"
+            :data="typeList"
+            @selection-change="handleSelectionChange"
+        >
+            <!-- <el-table-column type="selection" width="55" align="center" /> -->
+            <el-table-column
+                label="序号"
+                align="center"
+                width="80"
+                type="index"
             >
-              {{ item.v_name }}
-            </el-tag>
-          </el-row>
-        </el-form-item>
-        <el-form-item label="通知内容：">
-          <div class="message-info" v-html="sendMessageParams.message"></div>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button icon="el-icon-position" size="medium" type="primary" @click="submitForm">发 送</el-button>
-      </div>
-    </el-dialog>
-  </div>
+                <template scope="scope">
+                    <span>{{
+                        (queryParams.pageNum - 1) * 10 + scope.$index + 1
+                    }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="任务单号"
+                align="center"
+                prop="taskCode"
+                show-overflow-tooltip
+            />
+            <el-table-column
+                label="待办任务"
+                align="center"
+                prop="taskType"
+                show-overflow-tooltip
+            />
+            <el-table-column
+                label="待办事件"
+                align="center"
+                prop="taskEvent"
+            ></el-table-column>
+            <el-table-column
+                label="任务创建人"
+                align="center"
+                prop="createName"
+                show-overflow-tooltip
+            />
+            <el-table-column
+                label="创建时间"
+                align="center"
+                prop="createTime"
+                width="180"
+            >
+                <template slot-scope="scope">
+                    <span>{{ parseTime(scope.row.createTime) || '-' }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="操作"
+                align="center"
+                class-name="small-padding fixed-width"
+            >
+                <template slot-scope="{ row }">
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-edit"
+                        @click="handlePreview(row.taskTypeId, row.taskCode)"
+                    >
+                        查 看
+                    </el-button>
+
+                    <!-- 代办事件为领料任务时显示催办按钮 -->
+                    <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-edit-outline"
+                        style="color: #e6a23c"
+                        v-if="row.taskTypeId == 29"
+                        @click="
+                            handleUrging(
+                                row.taskTypeId,
+                                row.taskCode,
+                                row.taskEvent,
+                                row.taskId,
+                            )
+                        "
+                    >
+                        催 办
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+        />
+
+        <!-- 催办弹框 -->
+        <el-dialog
+            title="催办"
+            :visible.sync="urgingDialogVisible"
+            width="60%"
+            append-to-body
+            :before-close="handleCloseUrgingDialog"
+        >
+            <el-form label-width="120px" label-position="right">
+                <el-form-item label="待办人：">
+                    <el-row>
+                        <el-tag
+                            class="addressee"
+                            :closable="toPersonInfo.length > 1"
+                            type="info"
+                            v-for="(item, v) in toPersonInfo"
+                            :key="v.noticeUser"
+                            @close="handleDeleteToPerson(v)"
+                        >
+                            {{ item.v_name }}
+                        </el-tag>
+                    </el-row>
+                </el-form-item>
+                <el-form-item label="通知内容：">
+                    <div
+                        class="message-info"
+                        v-html="sendMessageParams.message"
+                    ></div>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button
+                    icon="el-icon-position"
+                    size="medium"
+                    type="primary"
+                    @click="submitForm"
+                    >发 送</el-button
+                >
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
@@ -288,7 +372,6 @@
                 this.resetForm('queryForm')
                 this.handleQuery()
             },
-<<<<<<< HEAD
 
             /**
              * 列表查看操作===========================================================
@@ -296,74 +379,6 @@
             handlePreview(id, key) {
                 const [routerInfo] = this.previewRouterList.filter(
                     (e) => e.taskTypeId == id,
-=======
-            /** 新增按钮操作 */
-            handleAdd() {
-                this.reset()
-                this.open = true
-                this.title = '添加字典类型'
-            },
-            // 多选框选中数据
-            handleSelectionChange(selection) {
-                this.ids = selection.map((item) => item.dictId)
-                this.single = selection.length != 1
-                this.multiple = !selection.length
-            },
-            /** 修改按钮操作 */
-            handleUpdate(row) {
-                // this.reset();
-                // const dictId = row.dictId || this.ids
-                // getType(dictId).then(response => {
-                //   this.form = response.data;
-                //   this.open = true;
-                //   this.title = "修改字典类型";
-                // });
-            },
-            /** 提交按钮 */
-            submitForm: function () {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        if (this.form.dictId != undefined) {
-                            updateType(this.form).then((response) => {
-                                this.$modal.msgSuccess('修改成功')
-                                this.open = false
-                                this.getList()
-                            })
-                        } else {
-                            addType(this.form).then((response) => {
-                                this.$modal.msgSuccess('新增成功')
-                                this.open = false
-                                this.getList()
-                            })
-                        }
-                    }
-                })
-            },
-            /** 删除按钮操作 */
-            handleDelete(row) {
-                const dictIds = row.dictId || this.ids
-                this.$modal
-                    .confirm(
-                        '是否确认删除所选择的数据项？',
-                    )
-                    .then(function () {
-                        return delType(dictIds)
-                    })
-                    .then(() => {
-                        this.getList()
-                        this.$modal.msgSuccess('删除成功')
-                    })
-                    .catch(() => {})
-            },
-            /** 导出按钮操作 */
-            handleExport() {
-                this.download(
-                    'system/dict/type/export',
-                    {
-                        ...this.queryParams,
-                    },
-                    `type_${new Date().getTime()}.xlsx`,
->>>>>>> dev-cq-bug
                 )
                 this.$router.push({
                     path: routerInfo.routerPath,
@@ -422,17 +437,17 @@
 </script>
 
 <style scoped>
-.message-info {
-  height: 100px;
-  padding: 0 10px;
-  border: 1px solid #ccc;
-  letter-spacing: 1px;
-  border-radius: 3px;
-  font-size: 16px;
-  font-weight: bold;
-}
+    .message-info {
+        height: 100px;
+        padding: 0 10px;
+        border: 1px solid #ccc;
+        letter-spacing: 1px;
+        border-radius: 3px;
+        font-size: 16px;
+        font-weight: bold;
+    }
 
-.addressee {
-  margin-left: 3px;
-}
+    .addressee {
+        margin-left: 3px;
+    }
 </style>
diff --git a/sgzb-ui/vue.config.js b/sgzb-ui/vue.config.js
index 867c27ca..dc551c70 100644
--- a/sgzb-ui/vue.config.js
+++ b/sgzb-ui/vue.config.js
@@ -35,14 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://112.29.103.165:21626`, //线上环境-重庆
-        // target: `http://112.29.103.165:21624`,//线上环境-宁夏 打包前放开数据大屏的路由
-        // target: `http://192.168.0.14:21624`, //测试环境
-        // target: `http://1.12.248.179:23028`,//线上环境-南网
-        // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
-        // target: `https://z.csgmall.com.cn`,
 
-        target: `http://10.40.92.14:8080`, //福
+        target: `http://10.40.92.14:28080`, //福
         // target: `http://10.40.92.153:8080`, //马帅
 
         //******** 注意事项  ********* */
@@ -143,20 +137,11 @@ module.exports = {
         },
       })
 
-<<<<<<< HEAD
       config.optimization.runtimeChunk("single"),
       {
         from: path.resolve(__dirname, "./public/robots.txt"), //防爬虫文件
         to: "./", //到根目录下
       };
     });
-=======
-      config.optimization.runtimeChunk('single'),
-        {
-          from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
-          to: './', //到根目录下
-        }
-    })
->>>>>>> dev-cq-bug
   },
 }