Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/system/mail/template/MailTemplateForm.vue

@@ -115,6 +115,7 @@ const onChange = async (field, cur) => {
 }
 
 const resetReceiverType = () => {
+  if (!formRef.value) return
   // 初始化设置值
     const setV = {
       roleIdList: [],

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts

@@ -555,6 +555,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'action',
     isDetail: false,
     isForm: false,
+    isTable:false,
     table: {
       width: 120,
       fixed: 'right'

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue

@@ -66,7 +66,7 @@
     :detailAllSchemasRules="ProductreceiptRequestDetailRules"
     :apiCreate="ProductreceiptRequestDetailApi.createProductreceiptRequestDetail"
     :apiUpdate="ProductreceiptRequestDetailApi.updateProductreceiptRequestDetail"
-    :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage"
+    :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageAssemble"
     :apiDelete="ProductreceiptRequestDetailApi.deleteProductreceiptRequestDetail"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :buttondataTable="buttondataTable"
@@ -163,7 +163,7 @@ const isCreateLabel = ref(false)
 const formLabelRef = ref()
 const labelType = ref('') // 标签类别 采购还是制造等 
 const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
-  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage
+  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageAssemble
 })
 const { getList:getDetailList } = detatableMethods