Merge remote-tracking branch 'origin/master'
| | |
| | | <!-- æä½æé®åºå --> |
| | | <div class="table-operator"> |
| | | <a-button type="primary" @click="searchQuery" icon="search">å·æ°</a-button> |
| | | <!-- <a-button @click="handleAdd" type="primary" icon="plus">æ°å¢</a-button>--> |
| | | <a-button @click="handleAdd" type="primary" icon="plus">æ¹éå®¡æ ¸</a-button> |
| | | </div> |
| | | |
| | | <!-- tableåºå-begin --> |
| | | <div> |
| | | <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> |
| | | <i class="anticon anticon-info-circle ant-alert-icon"></i> 已鿩 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 |
| | | <a style="margin-left: 24px" @click="onClearSelected">æ¸
空</a> |
| | | </div> |
| | | |
| | | <a-table |
| | | ref="table" |
| | |
| | | :dataSource="dataSource" |
| | | :pagination="ipagination" |
| | | :loading="loading" |
| | | :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" |
| | | class="j-table-force-nowrap" |
| | | @change="handleTableChange"> |
| | | |
| | |
| | | </template> |
| | | |
| | | <span slot="action" slot-scope="text, record"> |
| | | <a @click="handleEdit(record)">ç¼è¾</a> |
| | | <a @click="handleApproval(record)">审æ¹</a> |
| | | <a-divider type="vertical" /> |
| | | <a-dropdown> |
| | | <a class="ant-dropdown-link">æ´å¤ |
| | | <a-icon type="down" /> |
| | | </a> |
| | | <a-menu slot="overlay"> |
| | | <a-menu-item> |
| | | <a @click="handleDetail(record)">详æ
</a> |
| | | </a-menu-item> |
| | | <a-menu-item> |
| | | <a-popconfirm |
| | | title="ç¡®å®å é¤å?" |
| | | @confirm="() => handleDelete(record.id)" |
| | | > |
| | | <a>å é¤</a> |
| | | </a-popconfirm> |
| | | </a-menu-item> |
| | | </a-menu> |
| | | </a-dropdown> |
| | | <a @click="handleDetail(record)">详æ
</a> |
| | | </span> |
| | | </a-table> |
| | | </div> |
| | | |
| | | |
| | | <AssignApproveUserModal ref="modalForm" @ok="modalFormOk"></AssignApproveUserModal> |
| | | <WorkUpcomingModal ref="modalForm" @ok="modalFormOk"></WorkUpcomingModal> |
| | | |
| | | <WorkUpcomingApprovalModal ref="modalFormApproval" @ok="modalFormOk"></WorkUpcomingApprovalModal> |
| | | </a-card> |
| | | </template> |
| | | |
| | |
| | | import { mixinDevice } from '@/utils/mixin' |
| | | import { JeecgListMixin } from '@/mixins/JeecgListMixin' |
| | | import JDictSelectTag from '@comp/dict/JDictSelectTag.vue' |
| | | import AssignApproveUserModal from './modules/AssignApproveUser/AssignApproveUserModal__Style#Drawer.vue' |
| | | |
| | | import WorkUpcomingModal from './modules/WorkUpcoming/WorkUpcomingModal__Style#Drawer.vue' |
| | | import WorkUpcomingApprovalModal from './modules/WorkUpcoming/WorkUpcomingApprovalModal.vue' |
| | | export default { |
| | | name: 'AssignApproveUser', |
| | | mixins:[JeecgListMixin, mixinDevice], |
| | | components: { |
| | | JDictSelectTag, |
| | | AssignApproveUserModal |
| | | WorkUpcomingModal, |
| | | WorkUpcomingApprovalModal |
| | | }, |
| | | data () { |
| | | return { |
| | |
| | | } |
| | | }, |
| | | { |
| | | title: '产ååç§°', |
| | | title: 'ææ¡£åç§°', |
| | | align: "center", |
| | | dataIndex: 'productName', |
| | | dataIndex: 'assignFileStream.docName', |
| | | width: 200, |
| | | }, |
| | | { |
| | | title: 'é¨ä»¶åç§°', |
| | | align: "center", |
| | | dataIndex: 'componentName', |
| | | dataIndex: 'assignFileStream.deviceName', |
| | | width: 220, |
| | | }, |
| | | { |
| | | title: 'é¶ä»¶åç§°', |
| | | align: "center", |
| | | dataIndex: 'partsName', |
| | | width: 250, |
| | | }, |
| | | { |
| | | title: 'ææ¡£åç§°', |
| | | align: "center", |
| | | dataIndex: 'docName', |
| | | width: 250, |
| | | }, |
| | | { |
| | | title: '设å¤åç§°', |
| | | align: "center", |
| | | dataIndex: 'deviceName', |
| | | width: 250, |
| | | }, |
| | | { |
| | | title: 'ææ¡£çæ¬', |
| | | align: "center", |
| | | dataIndex: 'version', |
| | | dataIndex: 'assignFileStream.version', |
| | | width: 250, |
| | | }, |
| | | { |
| | | title: 'ç³è¯·äºº', |
| | | title: 'å¯çº§', |
| | | align: "center", |
| | | dataIndex: 'applyUser_dictText', |
| | | width:300 |
| | | }, |
| | | { |
| | | title: 'ç³è¯·åå ', |
| | | align: "center", |
| | | dataIndex: 'applyReason', |
| | | width:300 |
| | | }, |
| | | { |
| | | title: 'ç³è¯·æ¶é´', |
| | | align: "center", |
| | | dataIndex: 'applyTime', |
| | | width:300 |
| | | dataIndex: 'assignFileStream.secretLevel', |
| | | width: 250, |
| | | }, |
| | | { |
| | | title: 'æä½', |
| | |
| | | }, |
| | | methods: { |
| | | initDictConfig(){ |
| | | }, |
| | | handleApproval(record){ |
| | | this.$refs.modalFormApproval.edit(record); |
| | | this.$refs.modalFormApproval.title = "审æ¹"; |
| | | this.$refs.modalFormApproval.disableSubmit = false; |
| | | } |
| | | } |
| | | } |
| | |
| | | <a-input v-decorator="['componentName', validatorRules.componentName]" placeholder="请è¾å
¥é¨ä»¶åç§°"></a-input> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24"> |
| | | <a-col :span="24" v-if="part"> |
| | | <a-form-item label="é¶ä»¶åç§°" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-input v-decorator="['partsName', validatorRules.partsName]" placeholder="请è¾å
¥é¶ä»¶åç§°"></a-input> |
| | | </a-form-item> |
| | |
| | | edit: "/nc/definition/edit", |
| | | // queryById: "/zhshj/wglltwh/query/by/id" |
| | | }, |
| | | userOptions:[] |
| | | userOptions:[], |
| | | part:false, |
| | | } |
| | | }, |
| | | computed: { |
| | |
| | | this.form.resetFields(); |
| | | this.model = Object.assign({}, record); |
| | | this.visible = true; |
| | | if (record.partsName){ |
| | | this.part=true |
| | | } |
| | | this.$nextTick(() => { |
| | | this.form.setFieldsValue(pick(this.model,'productName','componentName','partsName','docName','deviceName','version','applyUser','applyReason','applyTime','approveUser','approveTime','approveContent')) |
| | | }) |
¶Ô±ÈÐÂÎļþ |
| | |
| | | <!-- |
| | | Description: æçå·¥ä½å°-代å-详æ
Form |
| | | Author: ä½è
liuyh |
| | | Date: 2025-01-15 |
| | | --> |
| | | <template> |
| | | <a-spin :spinning="confirmLoading"> |
| | | <j-form-container :disabled="formDisabled"> |
| | | <a-form :form="form" slot="detail"> |
| | | <a-row> |
| | | <a-col :span="24"> |
| | | <a-form-item label="ææ¡£åç§°" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-input v-decorator="['assignFileStream.docName', validatorRules.docName]" :disabled="true" placeholder="请è¾å
¥ææ¡£åç§°"></a-input> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24"> |
| | | <a-form-item label="ææ¡£çæ¬" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-input v-decorator="['assignFileStream.version', validatorRules.version]" :disabled="true" placeholder="请è¾å
¥ææ¡£çæ¬"></a-input> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24"> |
| | | <a-form-item label="ç³è¯·äºº" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-input v-decorator="['assignFileStream.applyUser', validatorRules.applyUser]" :disabled="true" placeholder="请è¾å
¥ç³è¯·äºº"></a-input> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24"> |
| | | <a-form-item label="ç³è¯·åå " :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-textarea v-decorator="['assignFileStream.applyReason']" rows="4" :disabled="true" placeholder="请è¾å
¥ç³è¯·åå "/> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24"> |
| | | <a-form-item label="å¯çº§ä¸º" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <j-dict-select-tag placeholder="è¯·éæ©å¯çº§" style="width:100%" :trigger-change="true" v-decorator="['secretLevel']" dictCode="dnc_secret_level"/> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24"> |
| | | <a-form-item label="åæå¯¼å
¥å·¥æ§ç½" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-checkbox v-model="isAgreed">åæå¯¼å
¥å·¥æ§ç½</a-checkbox> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24" > |
| | | <a-form-item label="审æ¹ç¶æ" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-select placeholder="审æ¹ç¶æ"> |
| | | <a-select-option v-if="isAgreed" value="1">åæ</a-select-option> |
| | | <a-select-option v-if="!isAgreed" value="2">æç»</a-select-option> |
| | | </a-select> |
| | | <!-- <j-dict-select-tag placeholder="è¯·éæ©å®¡æ¹ç¶æ" style="width:100%" :trigger-change="true" v-decorator="['status', validatorRules.status]" dictCode="dnc_assign_stream_status"/>--> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24"> |
| | | <a-form-item label="å®¡æ¹æè§" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-textarea v-decorator="['assignFileStream.approveContent', validatorRules.approveContent]" rows="4" placeholder="请è¾å
¥å®¡æ¹æè§"/> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center"> |
| | | <a-button @click="submitForm">æ 交</a-button> |
| | | </a-col> |
| | | </a-row> |
| | | </a-form> |
| | | </j-form-container> |
| | | </a-spin> |
| | | </template> |
| | | |
| | | <script> |
| | | |
| | | import { httpAction, getAction } from '@/api/manage' |
| | | import pick from 'lodash.pick' |
| | | import JFormContainer from '@/components/jeecg/JFormContainer' |
| | | import JDictSelectTag from "@/components/dict/JDictSelectTag" |
| | | |
| | | export default { |
| | | name: 'AssignApproveUserForm', |
| | | components: { |
| | | JFormContainer, |
| | | JDictSelectTag, |
| | | }, |
| | | props: { |
| | | //æµç¨è¡¨ådata |
| | | formData: { |
| | | type: Object, |
| | | default: ()=>{}, |
| | | required: false |
| | | }, |
| | | //è¡¨åæ¨¡å¼ï¼trueæµç¨è¡¨å falseæ®é表å |
| | | formBpm: { |
| | | type: Boolean, |
| | | default: false, |
| | | required: false |
| | | }, |
| | | //表åç¦ç¨ |
| | | disabled: { |
| | | type: Boolean, |
| | | default: false, |
| | | required: false |
| | | } |
| | | }, |
| | | data () { |
| | | return { |
| | | form: this.$form.createForm(this), |
| | | users:"", |
| | | isAgreed:true, |
| | | model: {}, |
| | | labelCol: { |
| | | xs: { span: 24 }, |
| | | sm: { span: 5 }, |
| | | }, |
| | | wrapperCol: { |
| | | xs: { span: 24 }, |
| | | sm: { span: 16 }, |
| | | }, |
| | | confirmLoading: false, |
| | | validatorRules: { |
| | | version: { |
| | | rules: [ |
| | | { required: true, message: '请è¾å
¥ææ¡£çæ¬!'}, |
| | | ] |
| | | }, |
| | | applyUser: { |
| | | rules: [ |
| | | { required: true, message: 'è¯·éæ©ç³è¯·äºº!'}, |
| | | ] |
| | | }, |
| | | approveContent: { |
| | | rules: [ |
| | | { required: true, message: '请è¾å
¥å®¡æ¹æè§!'}, |
| | | ] |
| | | }, |
| | | docName: { |
| | | rules: [ |
| | | { required: true, message: '请è¾å
¥ææ¡£åç§°!'}, |
| | | ] |
| | | }, |
| | | status: { |
| | | rules: [ |
| | | { required: true, message: 'è¯·éæ©å®¡æ¹ç¶æ!'}, |
| | | ] |
| | | }, |
| | | }, |
| | | url: { |
| | | add: "/nc/definition/add", |
| | | edit: "/nc/definition/edit", |
| | | approve:"/nc/activit/assign/file/approve", |
| | | // queryById: "/zhshj/wglltwh/query/by/id" |
| | | }, |
| | | userOptions:[], |
| | | part:false, |
| | | taskId:"", |
| | | streamId:"", |
| | | } |
| | | }, |
| | | computed: { |
| | | formDisabled(){ |
| | | if(this.formBpm===true){ |
| | | if(this.formData.disabled===false){ |
| | | return false |
| | | } |
| | | return true |
| | | } |
| | | return this.disabled |
| | | }, |
| | | showFlowSubmitButton(){ |
| | | if(this.formBpm===true){ |
| | | if(this.formData.disabled===false){ |
| | | return true |
| | | } |
| | | } |
| | | return false |
| | | } |
| | | }, |
| | | created () { |
| | | //å¦ææ¯æµç¨ä¸è¡¨åï¼åéè¦å è½½æµç¨è¡¨ådata |
| | | this.showFlowData(); |
| | | }, |
| | | methods: { |
| | | add () { |
| | | this.edit({}); |
| | | }, |
| | | edit (record) { |
| | | this.form.resetFields(); |
| | | this.model = Object.assign({}, record); |
| | | this.taskId=record.id; |
| | | this.streamId=record.businessKey; |
| | | if (record.assignFileStream.partsName){ |
| | | this.part=true |
| | | } |
| | | this.visible = true; |
| | | this.$nextTick(() => { |
| | | this.form.setFieldsValue(pick(this.model,'assignFileStream')) |
| | | }) |
| | | }, |
| | | getFormFieldValue(field){ |
| | | return this.form.getFieldValue(field) |
| | | }, |
| | | //æ¸²ææµç¨è¡¨åæ°æ® |
| | | showFlowData(){ |
| | | if(this.formBpm === true){ |
| | | let params = {id:this.formData.dataId}; |
| | | getAction(this.url.queryById,params).then((res)=>{ |
| | | if(res.success){ |
| | | this.edit (res.result); |
| | | } |
| | | }); |
| | | } |
| | | }, |
| | | submitForm () { |
| | | const that = this; |
| | | // 触å表åéªè¯ |
| | | this.form.validateFields((err, values) => { |
| | | if (!err) { |
| | | that.confirmLoading = true; |
| | | let url=this.url.approve+"/"+this.taskId+"/"+this.streamId; |
| | | let method = 'post'; |
| | | let formData = {}; |
| | | formData.approveContent = values.assignFileStream.approveContent; |
| | | if (this.isAgreed){ |
| | | formData.status ='2' |
| | | }else { |
| | | formData.status ='3' |
| | | } |
| | | console.log("表åæäº¤æ°æ®",formData) |
| | | httpAction(url,formData,method).then((res)=>{ |
| | | if(res.success){ |
| | | that.$message.success(res.message); |
| | | that.$emit('ok'); |
| | | }else{ |
| | | that.$message.warning(res.message); |
| | | } |
| | | }).finally(() => { |
| | | that.confirmLoading = false; |
| | | }) |
| | | } |
| | | |
| | | }) |
| | | }, |
| | | } |
| | | } |
| | | </script> |
¶Ô±ÈÐÂÎļþ |
| | |
| | | <!-- |
| | | Description: æçå·¥ä½å°-代å Modal |
| | | Author: ä½è
liuyh |
| | | Date: 2025-01-15 |
| | | --> |
| | | <template> |
| | | <j-modal |
| | | :title="title" |
| | | :width="width" |
| | | :visible="visible" |
| | | switchFullscreen |
| | | @ok="handleOk" |
| | | :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" |
| | | @cancel="handleCancel" |
| | | cancelText="å
³é"> |
| | | <WorkUpcomingApprovalForm ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></WorkUpcomingApprovalForm> |
| | | </j-modal> |
| | | </template> |
| | | |
| | | <script> |
| | | |
| | | import WorkUpcomingApprovalForm from './WorkUpcomingApprovalForm.vue' |
| | | export default { |
| | | name: 'AssignApproveUserModal', |
| | | components: { |
| | | WorkUpcomingApprovalForm |
| | | }, |
| | | data () { |
| | | return { |
| | | title:'', |
| | | width:800, |
| | | visible: false, |
| | | disableSubmit: false |
| | | } |
| | | }, |
| | | methods: { |
| | | add () { |
| | | this.visible=true |
| | | this.$nextTick(()=>{ |
| | | this.$refs.realForm.add(); |
| | | }) |
| | | }, |
| | | edit (record) { |
| | | this.visible=true |
| | | this.$nextTick(()=>{ |
| | | this.$refs.realForm.edit(record); |
| | | }) |
| | | }, |
| | | close () { |
| | | this.$emit('close'); |
| | | this.visible = false; |
| | | }, |
| | | handleOk () { |
| | | this.$refs.realForm.submitForm(); |
| | | }, |
| | | submitCallback(){ |
| | | this.$emit('ok'); |
| | | this.visible = false; |
| | | }, |
| | | handleCancel () { |
| | | this.close() |
| | | } |
| | | } |
| | | } |
| | | </script> |
¶Ô±ÈÐÂÎļþ |
| | |
| | | <!-- |
| | | Description: æçå·¥ä½å°-代å-详æ
Form |
| | | Author: ä½è
liuyh |
| | | Date: 2025-01-15 |
| | | --> |
| | | <template> |
| | | <a-spin :spinning="confirmLoading"> |
| | | <j-form-container :disabled="formDisabled"> |
| | | <a-form :form="form" slot="detail"> |
| | | <a-row> |
| | | <a-col :span="24"> |
| | | <a-form-item label="产ååç§°" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-input v-decorator="['assignFileStream.productName', validatorRules.productName]" placeholder="请è¾å
¥äº§ååç§°"></a-input> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24"> |
| | | <a-form-item label="é¨ä»¶åç§°" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-input v-decorator="['assignFileStream.componentName', validatorRules.componentName]" placeholder="请è¾å
¥é¨ä»¶åç§°"></a-input> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24" v-if="part"> |
| | | <a-form-item label="é¶ä»¶åç§°" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-input v-decorator="['assignFileStream.partsName', validatorRules.partsName]" placeholder="请è¾å
¥é¶ä»¶åç§°"></a-input> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24"> |
| | | <a-form-item label="ææ¡£åç§°" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-input v-decorator="['assignFileStream.docName', validatorRules.docName]" placeholder="请è¾å
¥ææ¡£åç§°"></a-input> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24"> |
| | | <a-form-item label="设å¤åç§°" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-input v-decorator="['assignFileStream.deviceName', validatorRules.deviceName]" placeholder="请è¾å
¥è®¾å¤åç§°"></a-input> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24"> |
| | | <a-form-item label="ææ¡£çæ¬" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-input v-decorator="['assignFileStream.version', validatorRules.version]" placeholder="请è¾å
¥ææ¡£çæ¬"></a-input> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24"> |
| | | <a-form-item label="ç³è¯·äºº" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-input v-decorator="['assignFileStream.applyUser', validatorRules.applyUser]" placeholder="请è¾å
¥ç³è¯·äºº"></a-input> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24"> |
| | | <a-form-item label="ç³è¯·åå " :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-input v-decorator="['assignFileStream.applyReason', validatorRules.applyReason]" placeholder="请è¾å
¥ç³è¯·åå "></a-input> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24"> |
| | | <a-form-item label="ç³è¯·æ¶é´" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-input v-decorator="['assignFileStream.applyTime', validatorRules.applyTime]" placeholder="请è¾å
¥ç³è¯·æ¶é´"></a-input> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24"> |
| | | <a-form-item label="审æ¹äºº" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-input v-decorator="['assignFileStream.approveUser', validatorRules.approveUser]" placeholder="请è¾å
¥å®¡æ¹äºº"></a-input> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24"> |
| | | <a-form-item label="å®¡æ¹æ¶é´" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-input v-decorator="['assignFileStream.approveTime', validatorRules.approveTime]" placeholder="请è¾å
¥å®¡æ¹æ¶é´"></a-input> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :span="24"> |
| | | <a-form-item label="å®¡æ¹æè§" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <a-textarea v-decorator="['assignFileStream.approveContent']" rows="4" placeholder="请è¾å
¥å®¡æ¹æè§"/> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center"> |
| | | <a-button @click="submitForm">æ 交</a-button> |
| | | </a-col> |
| | | </a-row> |
| | | </a-form> |
| | | </j-form-container> |
| | | </a-spin> |
| | | </template> |
| | | |
| | | <script> |
| | | |
| | | import { httpAction, getAction } from '@/api/manage' |
| | | import pick from 'lodash.pick' |
| | | import JFormContainer from '@/components/jeecg/JFormContainer' |
| | | import JDictSelectTag from "@/components/dict/JDictSelectTag" |
| | | |
| | | export default { |
| | | name: 'AssignApproveUserForm', |
| | | components: { |
| | | JFormContainer, |
| | | JDictSelectTag, |
| | | }, |
| | | props: { |
| | | //æµç¨è¡¨ådata |
| | | formData: { |
| | | type: Object, |
| | | default: ()=>{}, |
| | | required: false |
| | | }, |
| | | //è¡¨åæ¨¡å¼ï¼trueæµç¨è¡¨å falseæ®é表å |
| | | formBpm: { |
| | | type: Boolean, |
| | | default: false, |
| | | required: false |
| | | }, |
| | | //表åç¦ç¨ |
| | | disabled: { |
| | | type: Boolean, |
| | | default: false, |
| | | required: false |
| | | } |
| | | }, |
| | | data () { |
| | | return { |
| | | form: this.$form.createForm(this), |
| | | users:"", |
| | | model: {}, |
| | | labelCol: { |
| | | xs: { span: 24 }, |
| | | sm: { span: 5 }, |
| | | }, |
| | | wrapperCol: { |
| | | xs: { span: 24 }, |
| | | sm: { span: 16 }, |
| | | }, |
| | | confirmLoading: false, |
| | | validatorRules: { |
| | | actName: { |
| | | productName: [ |
| | | { required: true, message: '请è¾å
¥æµç¨åç§°!'}, |
| | | ] |
| | | }, |
| | | componentName: { |
| | | rules: [ |
| | | { required: true, message: 'è¯·éæ©é¨é¨åç»!'}, |
| | | ] |
| | | }, |
| | | partsName: { |
| | | rules: [ |
| | | { required: true, message: 'è¯·éæ©å®¡æ¹äºº!'}, |
| | | ] |
| | | }, |
| | | docName: { |
| | | rules: [ |
| | | { required: true, message: '请è¾å
¥ç¹æ®å符!'}, |
| | | ] |
| | | }, |
| | | deviceName: { |
| | | rules: [ |
| | | { required: true, message: '请è¾å
¥ç¹æ®å符!'}, |
| | | ] |
| | | }, |
| | | version: { |
| | | rules: [ |
| | | { required: true, message: '请è¾å
¥ç¹æ®å符!'}, |
| | | ] |
| | | }, |
| | | applyUser: { |
| | | rules: [ |
| | | { required: true, message: '请è¾å
¥ç¹æ®å符!'}, |
| | | ] |
| | | }, |
| | | applyReason: { |
| | | rules: [ |
| | | { required: true, message: '请è¾å
¥ç¹æ®å符!'}, |
| | | ] |
| | | }, |
| | | }, |
| | | url: { |
| | | add: "/nc/definition/add", |
| | | edit: "/nc/definition/edit", |
| | | // queryById: "/zhshj/wglltwh/query/by/id" |
| | | }, |
| | | userOptions:[], |
| | | part:false, |
| | | } |
| | | }, |
| | | computed: { |
| | | formDisabled(){ |
| | | if(this.formBpm===true){ |
| | | if(this.formData.disabled===false){ |
| | | return false |
| | | } |
| | | return true |
| | | } |
| | | return this.disabled |
| | | }, |
| | | showFlowSubmitButton(){ |
| | | if(this.formBpm===true){ |
| | | if(this.formData.disabled===false){ |
| | | return true |
| | | } |
| | | } |
| | | return false |
| | | } |
| | | }, |
| | | created () { |
| | | //å¦ææ¯æµç¨ä¸è¡¨åï¼åéè¦å è½½æµç¨è¡¨ådata |
| | | this.showFlowData(); |
| | | }, |
| | | methods: { |
| | | add () { |
| | | this.edit({}); |
| | | }, |
| | | edit (record) { |
| | | this.form.resetFields(); |
| | | this.model = Object.assign({}, record); |
| | | if (record.assignFileStream.partsName){ |
| | | this.part=true |
| | | } |
| | | this.visible = true; |
| | | this.$nextTick(() => { |
| | | this.form.setFieldsValue(pick(this.model,'assignFileStream')) |
| | | }) |
| | | }, |
| | | getFormFieldValue(field){ |
| | | return this.form.getFieldValue(field) |
| | | }, |
| | | //æ¸²ææµç¨è¡¨åæ°æ® |
| | | showFlowData(){ |
| | | if(this.formBpm === true){ |
| | | let params = {id:this.formData.dataId}; |
| | | getAction(this.url.queryById,params).then((res)=>{ |
| | | if(res.success){ |
| | | this.edit (res.result); |
| | | } |
| | | }); |
| | | } |
| | | }, |
| | | submitForm () { |
| | | const that = this; |
| | | // 触å表åéªè¯ |
| | | this.form.validateFields((err, values) => { |
| | | if (!err) { |
| | | that.confirmLoading = true; |
| | | let httpurl = ''; |
| | | let method = ''; |
| | | if(!this.model.id){ |
| | | httpurl+=this.url.add; |
| | | method = 'post'; |
| | | }else{ |
| | | httpurl+=this.url.edit; |
| | | method = 'put'; |
| | | } |
| | | let formData = Object.assign(this.model, values); |
| | | console.log("表åæäº¤æ°æ®",formData) |
| | | httpAction(httpurl,formData,method).then((res)=>{ |
| | | if(res.success){ |
| | | that.$message.success(res.message); |
| | | that.$emit('ok'); |
| | | }else{ |
| | | that.$message.warning(res.message); |
| | | } |
| | | }).finally(() => { |
| | | that.confirmLoading = false; |
| | | }) |
| | | } |
| | | |
| | | }) |
| | | }, |
| | | popupCallback(row){ |
| | | this.form.setFieldsValue(pick(row,'C')) |
| | | }, |
| | | } |
| | | } |
| | | </script> |
¶Ô±ÈÐÂÎļþ |
| | |
| | | <!-- |
| | | Description: æçå·¥ä½å°-代å Modal |
| | | Author: ä½è
liuyh |
| | | Date: 2025-01-15 |
| | | --> |
| | | <template> |
| | | <j-modal |
| | | :title="title" |
| | | :width="width" |
| | | :visible="visible" |
| | | switchFullscreen |
| | | @ok="handleOk" |
| | | :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" |
| | | @cancel="handleCancel" |
| | | cancelText="å
³é"> |
| | | <WorkUpcomingForm ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></WorkUpcomingForm> |
| | | </j-modal> |
| | | </template> |
| | | |
| | | <script> |
| | | |
| | | import WorkUpcomingForm from './WorkUpcomingForm.vue' |
| | | export default { |
| | | name: 'AssignApproveUserModal', |
| | | components: { |
| | | WorkUpcomingForm |
| | | }, |
| | | data () { |
| | | return { |
| | | title:'', |
| | | width:800, |
| | | visible: false, |
| | | disableSubmit: false |
| | | } |
| | | }, |
| | | methods: { |
| | | add () { |
| | | this.visible=true |
| | | this.$nextTick(()=>{ |
| | | this.$refs.realForm.add(); |
| | | }) |
| | | }, |
| | | edit (record) { |
| | | this.visible=true |
| | | this.$nextTick(()=>{ |
| | | this.$refs.realForm.edit(record); |
| | | }) |
| | | }, |
| | | close () { |
| | | this.$emit('close'); |
| | | this.visible = false; |
| | | }, |
| | | handleOk () { |
| | | this.$refs.realForm.submitForm(); |
| | | }, |
| | | submitCallback(){ |
| | | this.$emit('ok'); |
| | | this.visible = false; |
| | | }, |
| | | handleCancel () { |
| | | this.close() |
| | | } |
| | | } |
| | | } |
| | | </script> |
¶Ô±ÈÐÂÎļþ |
| | |
| | | <!-- |
| | | Description: æçå·¥ä½å°-代å Modal-Drawer |
| | | Author: ä½è
liuyh |
| | | Date: 2025-01-15 |
| | | --> |
| | | <template> |
| | | <a-drawer |
| | | :title="title" |
| | | :width="width" |
| | | placement="right" |
| | | :closable="false" |
| | | @close="close" |
| | | destroyOnClose |
| | | :visible="visible"> |
| | | <WorkUpcomingForm ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></WorkUpcomingForm> |
| | | <div class="drawer-footer"> |
| | | <a-button @click="handleCancel" style="margin-bottom: 0;">å
³é</a-button> |
| | | <a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">æäº¤</a-button> |
| | | </div> |
| | | </a-drawer> |
| | | </template> |
| | | |
| | | <script> |
| | | |
| | | |
| | | |
| | | import WorkUpcomingForm from './WorkUpcomingForm.vue' |
| | | |
| | | export default { |
| | | name: 'AssignApproveUserModal', |
| | | components: { |
| | | WorkUpcomingForm, |
| | | }, |
| | | data() { |
| | | return { |
| | | title: "æä½", |
| | | width: 800, |
| | | visible: false, |
| | | disableSubmit: false |
| | | } |
| | | }, |
| | | methods: { |
| | | add() { |
| | | this.visible = true |
| | | this.$nextTick(() => { |
| | | this.$refs.realForm.add(); |
| | | }) |
| | | }, |
| | | edit(record) { |
| | | this.visible = true |
| | | this.$nextTick(() => { |
| | | this.$refs.realForm.edit(record); |
| | | }); |
| | | }, |
| | | close() { |
| | | this.$emit('close'); |
| | | this.visible = false; |
| | | }, |
| | | submitCallback() { |
| | | this.$emit('ok'); |
| | | this.visible = false; |
| | | }, |
| | | handleOk() { |
| | | this.$refs.realForm.submitForm(); |
| | | }, |
| | | handleCancel() { |
| | | this.close() |
| | | } |
| | | } |
| | | } |
| | | </script> |
| | | |
| | | <style lang="less" scoped> |
| | | /** Buttonæé®é´è· */ |
| | | .ant-btn { |
| | | margin-left: 30px; |
| | | margin-bottom: 30px; |
| | | float: right; |
| | | } |
| | | .drawer-footer{ |
| | | position: absolute; |
| | | bottom: -8px; |
| | | width: 100%; |
| | | border-top: 1px solid #e8e8e8; |
| | | padding: 10px 16px; |
| | | text-align: right; |
| | | left: 0; |
| | | background: #fff; |
| | | border-radius: 0 0 2px 2px; |
| | | } |
| | | </style> |