whj 11 달 전
부모
커밋
c79d466146

+ 10 - 0
src/views/custom/className/CustomClassName.vue

@@ -109,6 +109,16 @@ export default {
             return this.classNameCodeMap[text]
           },
         },
+        {
+          title: '自定义处理',
+          dataIndex: 'publicFlag',
+          width: 120,
+          checked: true,
+          align: 'center',
+          customRender: (text, record, index) => {
+            return text ? '是' : '否'
+          },
+        },
         {
           title: '数据表',
           dataIndex: 'titleCode',

+ 8 - 0
src/views/custom/className/modules/BaseForm.vue

@@ -28,6 +28,11 @@
             <a-input v-decorator="['title', {rules: [{required: true, message: '名称不能为空'}]}]" />
           </a-form-item>
         </row-item>
+        <row-item>
+          <a-form-item label="自定义处理" :labelCol="BaseTool.Constant.labelCol" :wrapperCol="BaseTool.Constant.wrapperCol">
+            <a-switch v-decorator="['publicFlag', {initialValue: true, valuePropName: 'checked'}]" />
+          </a-form-item>
+        </row-item>
         <row-item>
           <a-form-item label="数据表" :labelCol="BaseTool.Constant.labelCol" :wrapperCol="BaseTool.Constant.wrapperCol">
             <a-input v-decorator="['titleCode', {rules: [{required: true, message: '名称编码不能为空'}]}]" />
@@ -106,6 +111,7 @@ export default {
         form: { setFieldsValue },
       } = this
       // 日期处理
+      record.publicFlag = Boolean(record.publicFlag)
       this.$nextTick(() => {
         setFieldsValue(
           Object.assign(
@@ -121,6 +127,7 @@ export default {
               'titleColumnCode',
               'handleName',
               'handleCode',
+              'publicFlag',
             ])
           )
         )
@@ -137,6 +144,7 @@ export default {
           return
         }
         // 日期处理
+        values.publicFlag = Number(values.publicFlag)
         if (this.BaseTool.String.isBlank(values.id)) {
           addCustomClassName(values)
             .then(() => {

+ 1 - 0
src/views/workplace/publish/Executed.vue

@@ -127,6 +127,7 @@ export default {
         },
         {
           title: '标题',
+          ellipsis: true,
           checked: true,
           width: 200,
           dataIndex: 'taskName',

+ 1 - 0
src/views/workplace/publish/MyPublish.vue

@@ -120,6 +120,7 @@ export default {
         },
         {
           title: '标题',
+          ellipsis: true,
           checked: true,
           width: 200,
           dataIndex: 'taskName',

+ 1 - 0
src/views/workplace/publish/WaitPublish.vue

@@ -140,6 +140,7 @@ export default {
         },
         {
           title: '标题',
+          ellipsis: true,
           dataIndex: 'taskName',
         },
         {

+ 7 - 3
src/views/workplace/publish/WaitWork.vue

@@ -75,6 +75,10 @@
             <operation-button @click="handleAudit(record.id)">审核</operation-button>
           </template>
         </span>
+        <template #readFlag="text">
+          <a-icon type="eye" v-if="text" style="color: #1890ff" />
+          <a-icon type="eye-invisible" v-else />
+        </template>
       </s-table>
     </div>
     <AuditDetail ref="auditDetail" @ok="handleOk" />
@@ -130,6 +134,7 @@ export default {
         {
           title: '标题',
           checked: true,
+          ellipsis: true,
           width: 300,
           dataIndex: 'taskName',
         },
@@ -174,10 +179,9 @@ export default {
           checked: true,
           width: 120,
           dataIndex: 'readFlag',
+          align: 'center',
           fixed: 'right',
-          customRender: (text, record, index) => {
-            return this.yesMap[text]
-          },
+          scopedSlots: { customRender: 'readFlag' },
         },
         {
           title: '操作',