Merge remote-tracking branch 'origin/master_hella' into master_hella

src/utils/dict.ts

@@ -286,6 +286,7 @@ export enum DICT_TYPE {
   BILL_TYPE = 'bill_type', // 发票类型
   CONTAIN_MANAGE_TYPE = 'contain_menage_type', //器具管理类型
   INVOICE_BALANCE_STATEMENT_STATUS = 'invoice_balance_statement_status', //是否有价差
+  PL_MSTR_TYPE = 'pl_mstr_type', //产品类类型
 
   // ========== 业务 - mes ==========
   MESDO_STATUS = 'mes_do_status', // 工单执行状态

src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts

@@ -17,6 +17,7 @@ export const SubjectAccountRules = reactive({
   projectId: [required],
   projectCode: [required],
   available: [required],
+  isFromPlMstr:[required]
 })
 
 export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
@@ -180,6 +181,42 @@ export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
+  {
+    label: '是否来自产品类',
+    field: 'isFromPlMstr',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 140
+    },
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '产品类类型',
+    field: 'plMstrType',
+    sort: 'custom',
+    isSearch: false,
+    dictType: DICT_TYPE.PL_MSTR_TYPE,
+    dictClass: 'string',
+    isTable: true,
+    table: {
+      width: 120
+    },
+    form:{
+      componentProps:{
+        disabled:false
+      }
+    }
+  },
   {
     label: '备注',
     field: 'remark',

src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts

@@ -440,7 +440,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '承接人用户名',
-    field: 'acceptUserId',
+    field: 'acceptUserName',
     sort: 'custom',
     table: {
       width: 150
@@ -449,7 +449,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '完成人用户名',
-    field: 'completeUserId',
+    field: 'completeUserName',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue

@@ -191,7 +191,7 @@ const buttonBaseClick = (val, item) => {
 }
 
 const BASE_URL = getJmreportBaseUrl()
-const srcPoint = ref(BASE_URL + '/jmreport/view/970564557155733504?token=' + getAccessToken())
+const srcPoint = ref(BASE_URL + '/jmreport/view/970966724605804544?token=' + getAccessToken())
 const handleSelectionPoint = async ()=>{
   let rows:any = []
   selectionRows.value.forEach(item=>{