Merge remote-tracking branch 'origin/master'

zhaowei

2025-01-20 2bfc0b2e2917e2d953aefcdb53a796491a51be23

Merge remote-tracking branch 'origin/master'

 src/views/dnc/base/WorkDoneList.vue

@@ -79,7 +79,7 @@
    </div>


    <AssignApproveUserModal ref="modalForm" @ok="modalFormOk"></AssignApproveUserModal>
    <WorkDoneModal ref="modalForm" @ok="modalFormOk"></WorkDoneModal>

  </a-card>
</template>
@@ -90,14 +90,14 @@
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 WorkDoneModal from './modules/WorkDone/WorkDoneModal__Style#Drawer.vue'

export default {
  name: 'AssignApproveUser',
  mixins:[JeecgListMixin, mixinDevice],
  components: {
    JDictSelectTag,
    AssignApproveUserModal
    WorkDoneModal
  },
  data () {
    return {

 src/views/dnc/base/modules/WorkDone/WorkDoneForm.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,262 @@
<!--
 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="['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="['componentName', validatorRules.componentName]" placeholder="请输入部件名称"></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="24">
            <a-form-item label="零件名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input  v-decorator="['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="['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="['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="['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="['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="['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="['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="['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="['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="['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:[]
      }
    },
    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.visible = true;
        this.$nextTick(() => {
          this.form.setFieldsValue(pick(this.model,'productName','componentName','partsName','docName','deviceName','version','applyUser','applyReason','applyTime','approveUser','approveTime','approveContent'))
        })
      },
      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,'productName','componentName','partsName','docName','deviceName','version','applyUser','applyReason','applyTime','approveUser','approveTime','approveContent'))
      },
    }
  }
</script>

 src/views/dnc/base/modules/WorkDone/WorkDoneModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,65 @@
<!--
 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="关闭">
    <WorkDoneForm ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></WorkDoneForm>
  </j-modal>
</template>

<script>

  import WorkDoneForm from './WorkDoneForm.vue'
  export default {
    name: 'AssignApproveUserModal',
    components: {
      WorkDoneForm
    },
    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>

 src/views/dnc/base/modules/WorkDone/WorkDoneModal__Style#Drawer.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,91 @@
<!--
 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">
    <WorkDoneForm ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></WorkDoneForm>
    <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 WorkDoneForm from './WorkDoneForm.vue'

export default {
  name: 'AssignApproveUserModal',
  components: {
    WorkDoneForm,
  },
  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>