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

src/api/wms/productreceiptJobDetail/index.ts

@@ -53,6 +53,19 @@ export const getProductreceiptJobDetailPageAssemble = async (params) => {
   }
 }
 
+
+// 查询制品收货任务子列表
+export const getProductreceiptJobDetailPageScarp = async (params) => {
+  params.type = 'scrap'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-job-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-job-detail/page`, params })
+  }
+}
+
 // 查询制品收货任务子详情
 export const getProductreceiptJobDetail = async (id: number) => {
   return await request.get({ url: `/wms/productreceipt-job-detail/get?id=` + id })

src/api/wms/productreceiptRecordDetail/index.ts

@@ -58,6 +58,18 @@ export const getProductreceiptRecordDetailPageAssemble = async (params) => {
   }
 }
 
+// 查询制品收货记录子列表
+export const getProductreceiptRecordDetailPageScrap = async (params) => {
+  params.type = 'scrap'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-record-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-record-detail/page`, params })
+  }
+}
+
 // 查询制品收货记录子详情
 export const getProductreceiptRecordDetail = async (id: number) => {
   return await request.get({ url: `/wms/productreceipt-record-detail/get?id=` + id })

src/api/wms/productreceiptRequestDetail/index.ts

@@ -54,6 +54,18 @@ export const getProductreceiptRequestDetailPageAssemble = async (params) => {
   }
 }
 
+// 查询报废收货申请子列表
+export const getProductreceiptRequestDetailPageScrap = async (params) => {
+  params.type = 'scrap'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-request-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/productreceipt-request-detail/page`, params })
+  }
+}
+
 // 查询制品收货申请子详情
 export const getProductreceiptRequestDetail = async (id: number) => {
   return await request.get({ url: `/wms/productreceipt-request-detail/get?id=` + id })

src/views/system/user/UserAssignRoleForm.vue

@@ -1,13 +1,13 @@
 <template>
   <Dialog v-model="dialogVisible" title="分配角色">
-    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="80px">
       <el-form-item label="用户名称">
         <el-input v-model="formData.username" :disabled="true" />
       </el-form-item>
       <el-form-item label="用户昵称">
         <el-input v-model="formData.nickname" :disabled="true" />
       </el-form-item>
-      <el-form-item label="角色">
+      <el-form-item label="角色" prop="roleIds">
         <el-select v-model="formData.roleIds" multiple placeholder="请选择角色">
           <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
@@ -37,6 +37,9 @@ const formData = ref({
   username: '',
   roleIds: []
 })
+const formRules = reactive({
+  roleIds: [{ required: true, message:'请选择角色', trigger: 'change' }]
+})
 const formRef = ref() // 表单 Ref
 const roleList = ref([]) // 角色的列表
 

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue

@@ -62,7 +62,7 @@
     :detailAllSchemas="ProductreceiptJobDetail.allSchemas"
     :detailAllSchemasRules="ProductreceiptJobDetailRules"
     :searchTableParams="searchTableParams"
-    :apiPage="ProductreceiptJobDetailApi.getProductreceiptJobDetailPage"
+    :apiPage="ProductreceiptJobDetailApi.getProductreceiptJobDetailPageScarp"
   />
 </template>
 
@@ -108,7 +108,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductreceiptJobDetailApi.getProductreceiptJobDetailPage // 报废收货分页接口
+  getListApi: ProductreceiptJobDetailApi.getProductreceiptJobDetailPageScarp // 报废收货分页接口
 })
 
 // 获得表格的各种操作

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/index.vue

@@ -57,7 +57,7 @@
     :allSchemas="ProductreceiptRecordMain.allSchemas"
     :detailAllSchemas="ProductreceiptRecordDetail.allSchemas"
     :detailAllSchemasRules="ProductreceiptRecordDetailRules"
-    :apiPage="ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPage"
+    :apiPage="ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPageScrap"
     :buttondataTable="buttondataTable"
     @tableFormButton="tableFormButton"
   />
@@ -128,7 +128,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPage // 报废收货分页接口
+  getListApi: ProductreceiptRecordDetailApi.getProductreceiptRecordDetailPageScrap // 报废收货分页接口
 })
 
 // 获得表格的各种操作

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue

@@ -66,7 +66,7 @@
     :detailAllSchemasRules="ProductreceiptRequestDetailRules"
     :apiCreate="ProductreceiptRequestDetailApi.createProductreceiptRequestDetail"
     :apiUpdate="ProductreceiptRequestDetailApi.updateProductreceiptRequestDetail"
-    :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage"
+    :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageScrap"
     :apiDelete="ProductreceiptRequestDetailApi.deleteProductreceiptRequestDetail"
     @searchTableSuccessDetail="searchTableSuccessDetail"
     :buttondataTable="buttondataTable"
@@ -158,7 +158,7 @@ const isCreateLabel = ref(false)
 const formLabelRef = ref()
 const labelType = ref('') // 标签类别 采购还是制造等 
 const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
-  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage
+  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageScrap
 })
 const { getList:getDetailList } = detatableMethods
 
@@ -203,7 +203,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage // 报废收货分页接口
+  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageScrap // 报废收货分页接口
 })
 
 // 获得表格的各种操作
@@ -546,9 +546,11 @@ const submitForm = async (formType, data) => {
   try {
     if (formType === 'create') {
       data.productionLineCode = data.subList[0].productionLineCode;
+      data.type='scrap'
       await ProductreceiptRequestMainApi.createProductreceiptRequestMain(data)
       message.success(t('common.createSuccess'))
     } else {
+      data.type='scrap'
       await ProductreceiptRequestMainApi.updateProductreceiptRequestMain(data)
       message.success(t('common.updateSuccess'))
     }