fix 8544 检查项被应用后禁止删除显示优化

api/app/lib/controllers/patrolManage/checkItems.js

@@ -50,6 +50,8 @@ async function getCheckItems(ctx, next) {
                 required: true,
                 model: models.CheckItemsGroup,
                 attributes: ['id', 'name'],
+            }, {
+                model: models.PatrolTemplate
             }]
         }
         if (name) {

api/app/lib/index.js

@@ -71,7 +71,7 @@ module.exports.models = function (dc) { // dc = { orm: Sequelize对象, ORM: Seq
     PatrolTemplate.belongsTo(User, { foreignKey: 'createUserId', targetKey: 'id' });
     User.hasMany(PatrolTemplate, { foreignKey: 'createUserId', sourceKey: 'id' });
 
-    CheckItems.belongsToMany(PatrolTemplate, { through: PatrolTemplateCheckItems, foreignKey: 'templateId', otherKey: 'checkItemsId' });
+    CheckItems.belongsToMany(PatrolTemplate, { through: PatrolTemplateCheckItems, foreignKey: 'checkItemsId', otherKey: 'templateId' });
     PatrolTemplate.belongsToMany(CheckItems, { through: PatrolTemplateCheckItems, foreignKey: 'templateId', otherKey: 'checkItemsId' });
 
     UserResource.belongsTo(Resource, { foreignKey: 'resourceId', targetKey: 'code' });

api/app/lib/models/check_items.js

@@ -4,7 +4,7 @@
 module.exports = dc => {
   const DataTypes = dc.ORM;
   const sequelize = dc.orm;
-  const CheckItems = sequelize.define("check_items", {
+  const CheckItems = sequelize.define("checkItems", {
     id: {
       field: "id",
       type: DataTypes.INTEGER,

api/app/lib/models/check_items_group.js

@@ -4,7 +4,7 @@
 module.exports = dc => {
   const DataTypes = dc.ORM;
   const sequelize = dc.orm;
-  const CheckItemsGroup = sequelize.define("check_items_group", {
+  const CheckItemsGroup = sequelize.define("checkItemsGroup", {
     id: {
       field: "id",
       type: DataTypes.INTEGER,

weapp/package/inspectionInput/inspectionInput.js

@@ -63,7 +63,7 @@ Page({
   // 获取巡检模板
   getPatrolTemplate(templateId) {
     Request.get(getPatrolTemplate(templateId)).then(res => {
-      const checkItems = res.rows[0].check_items;
+      const checkItems = res.rows[0].checkItems;
       const inspectContent = {};
       for (const c of checkItems) {
         inspectContent[c.name] = {

web/client/src/sections/patrolManage/containers/checkItems.js

@@ -67,7 +67,7 @@ function CheckItems(props) {
     search: false,
     width: 150,
     render: (_, record) => {
-      return <div>{record?.check_items_group?.name}</div>
+      return <div>{record?.checkItemsGroup?.name}</div>
     }
   }, {
     title: '操作',
@@ -84,7 +84,7 @@ function CheckItems(props) {
         <Popconfirm
           title="确认删除？"
           onConfirm={() => { delItems(record.id) }}>
-          <Button type="link" danger>删除</Button>
+          <Button type="link" danger disabled={record && record.patrolTemplates && record.patrolTemplates.length}>删除</Button>
         </Popconfirm>
       </>
     },
@@ -106,7 +106,10 @@ function CheckItems(props) {
             name: params?.name
           }));
           setDataSource(res?.payload.data?.rows);
-          return { ...res };
+          return {
+            ...res,
+            total: res.payload.data.count ? res.payload.data.count : 0,
+          };
         }}
         onReset={() => { }}
         search={{

web/client/src/sections/patrolManage/containers/patrolTemplate.js

@@ -42,7 +42,7 @@ function PatrolTemplate (props) {
         key: 'checkItems',
         ellipsis: true,
         render: (_, r) => {
-            return r?.check_items ? r?.check_items.map(c => <Tag>{c.name}</Tag>) : '-'
+            return r?.checkItems ? r?.checkItems.map(c => <Tag>{c.name}</Tag>) : '-'
         }
     }, {
         title: '操作',