da06b17d52a4424122825284323432c490f7cdae..78583768eee54c0216e7492b636806b214219342
2022-08-10 shj
Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
785837 对比 | 目录
2022-08-10 shj
对接
6ea146 对比 | 目录
已修改6个文件
16 ■■■■ 文件已修改
src/components/equipmentDailog/Dailog.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/facilityManagement/InstrumentationInformation/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/facilityManagement/ProductionEquipment/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/facilityManagement/safetyEquipment/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/goalManagement/targetDecompositionMonth/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/goalManagement/targetDecompositionYear/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/equipmentDailog/Dailog.vue
@@ -523,7 +523,7 @@
            qUsage: [],
            model: [],
            equipmentTypeId: [],
            equipmentTypeName: [],
            equipmentTypeName: [{ required: true, message: '类型/类别外键不能为空', trigger: 'change' }],
            departmentId: [],
            setPart: [],
            produceTime: [],
src/views/facilityManagement/InstrumentationInformation/index.vue
@@ -27,7 +27,7 @@
                <div class="btns">
                    <div>
                        <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
                        <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button>
                        <!-- <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button> -->
                        <el-button size="default" :disabled="danger" type="danger" :icon="Delete" @click="onDeleteAll" plain>删除</el-button>
                    </div>
                    <div>
src/views/facilityManagement/ProductionEquipment/index.vue
@@ -28,7 +28,7 @@
                <div class="btns">
                    <div>
                        <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
                        <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button>
                        <!-- <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button> -->
                        <el-button size="default" :disabled="danger" type="danger" :icon="Delete" @click="onDeleteAll" plain>删除</el-button>
                    </div>
                    <div>
@@ -136,7 +136,7 @@
            searchParams: {
                qName: '', ////名称
                positionNum: '', ////位号
                infoType: 0, ////具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施
                infoType: 1, ////具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施
            },
        });
        // 重置
src/views/facilityManagement/safetyEquipment/index.vue
@@ -28,7 +28,7 @@
                <div class="btns">
                    <div>
                        <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
                        <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button>
                        <!-- <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button> -->
                        <el-button size="default" :disabled="danger" type="danger" :icon="Delete" @click="onDeleteAll" plain>删除</el-button>
                    </div>
                    <div>
@@ -137,7 +137,7 @@
            searchParams: {
                qName: '', ////名称
                positionNum: '', ////位号
                infoType: 0, ////具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施
                infoType: 2, ////具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施
            },
        });
        // 重置
src/views/goalManagement/targetDecompositionMonth/index.vue
@@ -24,7 +24,7 @@
            <div class="btns">
                <div>
                    <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
                    <el-button size="default" type="warning" :disabled="warning" :icon="EditPen" plain>修改</el-button>
                    <!-- <el-button size="default" type="warning" :disabled="warning" :icon="EditPen" plain>修改</el-button> -->
                    <el-button size="default" type="danger" :disabled="danger" :icon="Delete" plain @click="onDeleteAll">删除</el-button>
                </div>
            </div>
src/views/goalManagement/targetDecompositionYear/index.vue
@@ -24,7 +24,7 @@
            <div class="btns">
                <div>
                    <el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
                    <el-button size="default" type="warning" :disabled="warning" :icon="EditPen" plain>修改</el-button>
                    <!-- <el-button size="default" type="warning" :disabled="warning" :icon="EditPen" plain>修改</el-button> -->
                    <el-button size="default" type="danger" :disabled="danger" :icon="Delete" plain @click="onDeleteAll">删除</el-button>
                </div>
            </div>