@@ -357,6 +375,8 @@
+
+
@@ -369,15 +389,20 @@ import ExcelExportPage from '@/views/excel/modules/ExcelExportPage.vue';
import ExcelImportModel from '@/views/excel/modules/ExcelImportModel.vue';
import ExcelImportPage from '@/views/excel/modules/ExcelImportPage.vue';
import MergerGoodsModal from './modules/MergerGoodsModal';
+import batchAuditPassDialog from './modules/batchAuditPassDialog';
+import batchAuditUserDialog from './modules/batchAuditUserDialog';
import FlowListModal from './modules/FlowListModal';
import { mapGetters } from 'vuex';
import AppprovalUserSelect from '@/components/AppprovalUserSelect/index';
import { getAction, postAction } from '@/api/manage';
+import lodash from 'lodash';
export default {
name: 'productClassify',
mixins: [JeecgListMixin, mixinDevice, WGridResizeByCssMixin],
components: {
+ batchAuditPassDialog,
+ batchAuditUserDialog,
MergerGoodsModal,
ExcelExportModel,
ExcelImportModel,
@@ -694,6 +719,8 @@ export default {
preAuditVerification: '/merger/mergerGoods/preAuditVerification',
regulationValid: '/interfaces/hscode/desc/regulationExpand',
exportXlsEleUrl: 'merger/mergerReqsRdElem/exportXls',
+ batchAuditPass: '/flow/common/batch-approve-pass',
+ batchAuditSubmit: '/flow/common/batch-submit'
},
flowStatusCode: '',
dictOptions: {},
@@ -705,6 +732,9 @@ export default {
record: null,
country: '',
hiddenColumns: false,
+ handlersData: [],
+ batchAuditSubmitLoading: false,
+ batchAuditPassLoading: false
};
},
created() {
@@ -922,8 +952,8 @@ export default {
// 商品归类的转派 和审核提交
if (this.flag === 'productClassify') {
const obj = this.selectionRows[0];
- if (!['010', '070', '030'].includes(obj.classifyStatus) || obj.globalLock === 'Y') {
- this.$warning({ title: '提示', content: '请选择全球锁为N且归类状态为商品归类、审核退回或重新归类的数据！' });
+ if (!['010', '070', '030', '090'].includes(obj.classifyStatus)) {
+ this.$warning({ title: '提示', content: '请选择归类状态为商品归类、审核退回或重新归类的数据！' });
return;
}
}
@@ -1192,6 +1222,125 @@ export default {
'MIDEA_MERGER_REQS_RD_ELEM'
);
},
+ selectionRowsVerify (max,msg){
+ if (this.selectionRows.length === 0) {
+ this.$message.warning('请选择至少一条数据进行操作！');
+ return false;
+ }
+ if (max && this.selectionRows.length > max) {
+ this.$message.warning(msg || `最多选择${max}条数据进行操作！`);
+ return false;
+ }
+ return true;
+ },
+ passHandleOk(data) {
+ if (data.type === 'submit') {
+ this.submitPostHandle(data);
+ } else {
+ this.passPostHandle(data);
+ }
+ },
+ passPostHandle(data) {
+ const that = this;
+ this.batchAuditPassLoading = true;
+ postAction(that.url.batchAuditPass, {
+ mergerGoodsIds: that.selectedRowKeys,
+ auditNote: data.remark,
+ handlers: [],
+ fdTemplateCode: 'mergerApply',
+ }).then(res => {
+ if (res && res.success) {
+ that.batchNoticeHandle(res, 'pass');
+ }
+ }).finally(() => {
+ that.batchAuditPassLoading = false;
+ });
+ },
+ submitPostHandle(data) {
+ const that = this;
+ this.batchAuditSubmitLoading = true;
+ postAction(that.url.batchAuditSubmit, {
+ mergerGoodsIds: that.selectedRowKeys,
+ auditNote: data.remark,
+ handlers: this.handlersData,
+ fdTemplateCode: 'mergerApply',
+ }).then(res => {
+ if (res && res.success) {
+ that.batchNoticeHandle(res);
+ }
+ }).finally(() => {
+ that.batchAuditSubmitLoading = false;
+ });
+ },
+ userHandleOk(data) {
+ this.handlersData = lodash.isEmpty(data) ? [] : [
+ {
+ unmodifiable: true,
+ name: data.operatorName,
+ id: data.operator,
+ type: 'USER'
+ }
+ ];
+ this.$refs.batchAuditPassDialogRef.show({
+ title: '批量提交审核',
+ type: 'submit'
+ });
+ },
+ batchAuditPassHandle() {
+ if (!this.selectionRowsVerify(50)) {
+ return;
+ }
+ this.$refs.batchAuditPassDialogRef.show({
+ title: '批量审核通过',
+ type: 'pass'
+ });
+ },
+ batchAuditSubmitHandle() {
+ const that = this;
+ if (!this.selectionRowsVerify(50)) {
+ return;
+ }
+ if (this.selectionRows.some(i => i.classifyStatus === '090')) {
+ this.$message.warning('不能勾选状态为090-归类驳回的数据进行操作！');
+ return;
+ }
+ this.$confirm({
+ content: `是否修改审批人?`,
+ okText: '是',
+ cancelText: '否',
+ onOk: function () {
+ that.$refs.batchAuditUserDialogRef.show({});
+ },
+ onCancel: function () {
+ that.handlersData = [];
+ that.$refs.batchAuditPassDialogRef.show({
+ title: '批量提交审核',
+ type: 'submit'
+ });
+ }
+ });
+ },
+ batchNoticeHandle(res, type = 'submit') {
+ let msg = ''
+ if (res.result && res.result.fail > 0) {
+ if (type === 'pass') {
+ msg = '(' + res.result.approveFailMsg + ')';
+ } else {
+ msg = '(料号:' + res.result.partNo + ')';
+ }
+ }
+ this.$MdAlert(
+ `
成功:${res.result.success}条
` +
+ `失败:${res.result.fail}条 ${msg}
`,
+ '处理结果', {
+ showClose: false,
+ confirmButtonText: '确定',
+ dangerouslyUseHTMLString: true,
+ callback: () => {
+ this.loadData();
+ },
+ });
+ }
},
};
diff --git a/src/views/merger/mergeredConfig/productClassify/modules/CNregulatoryConditions.vue b/src/views/merger/mergeredConfig/productClassify/modules/CNregulatoryConditions.vue
index d06f435..f1475e8 100644
--- a/src/views/merger/mergeredConfig/productClassify/modules/CNregulatoryConditions.vue
+++ b/src/views/merger/mergeredConfig/productClassify/modules/CNregulatoryConditions.vue
@@ -18,6 +18,14 @@
重置
+
+
+
+ 监管条件内容为：所选“附加编码”匹配监管条件说明内容，前3位数值一致的结果
+
+
+
+