Merge remote-tracking branch 'origin/master'

zhaowei

2025-01-20 2bfc0b2e2917e2d953aefcdb53a796491a51be23

 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 {