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

src/api/wms/supplierinvoiceRequestMain/index.ts

@@ -141,3 +141,9 @@ export const queryUserInfoByRoleCode = async (params) => {
   return await request.get({ url: `/wms/supplierinvoice-request-main/queryUserInfoByRoleCodePage`, params })
   
 }
+// 获取供应商角色
+export const getLoginUserRoleList = async () => {
+  return await request.get({ url: `/wms/supplierinvoice-request-main/getLoginUserRoleList`})
+  
+}
+

src/views/wms/issueManage/issue/issueJobMain/index.vue

@@ -33,9 +33,9 @@
           <span>{{ row.number }}</span>
         </el-button>
       </template>
-      <!-- <template #action="{ row,$index }">
+      <template #action="{ row,$index }">
         <ButtonBase :Butttondata="butttondata(row,$index)" @button-base-click="buttonTableClick($event,row)" />
-      </template> -->
+      </template>
     </Table>
   </ContentWrap>
 

src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue

@@ -304,7 +304,8 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainJobAba') { // 放弃
     RepleinshJobMainApi.abandonRepleinshMain(row.masterId)
   } else if (val == 'mainJobClo') { // 关闭
-    RepleinshJobMainApi.closeRepleinshMain(row.masterId)
+    await RepleinshJobMainApi.closeRepleinshMain(row.masterId)
+    getList()
   } else if (val == 'mainJobAcc') { // 承接
     RepleinshJobMainApi.acceptRepleinshMain(row.masterId)
   }

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

@@ -480,6 +480,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortSearchDefault:1000,
     isSearch: true,
     sortTableDefault:1100,
+    isTableForm: false,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
@@ -560,15 +561,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       disabled: true
     }
   },
-  {
-    label: '到库位代码',
-    field: 'toLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-  },
+  
   {
     label: '单据号',
     field: 'number',

src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts

@@ -318,7 +318,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'fromPackingNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 220
     },
     sortTableDefault:6,
   },
@@ -420,9 +420,9 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     label: '物料名称',
     field: 'itemName',
     sort: 'custom',
-    table: {
-      width: 150
-    },
+    // table: {
+    //   width: 150
+    // },
     sortTableDefault:3,
   },
   // {

src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue

@@ -323,7 +323,8 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainJobAba') { // 放弃
     ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId)
   } else if (val == 'mainJobClo') { // 关闭
-    ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId)
+    await ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId)
+    getList()
   } else if (val == 'mainJobAcc') { // 承接
     ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId)
   }

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

@@ -140,6 +140,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:supplierinvoice-record-main:export'}), // 导出
+  // defaultButtons.mainLisSelectiontPointBtn(null), // 批量打印
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -157,6 +158,8 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'export') { // 导出
     handleExport()
+  }else if (val=='selection_point'){// 批量打印
+    handleSelectionPoint()
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
       searchFormClick({
@@ -170,7 +173,24 @@ const buttonBaseClick = (val, item) => {
     console.log('其他按钮', item)
   }
 }
+const handleSelectionPoint = async ()=>{
+  let rows:any = []
+  selectionRows.value.forEach(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
+  })
+  if(rows.length==0){
+    return
+  }
+  console.log('批量打印',rows.join(','))
+  // let getLoading = ElLoading.service({
+  //   lock: true,
+  //   text: 'loading...',
+  //   background: 'rgba(0, 0, 0, 0.7)'
+  // })
+  // getLoading?.close()
+  
 
+}
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   return []

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

@@ -362,7 +362,7 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
       {
         label: t('ts.供应商确认'),
         name: 'invoice_sent_out',
-        hide: isShowMainButton(row, ['8']),
+        hide: isShowMainButton(row, ['3','7']),
         type: 'danger',
         color: '',
         link: true, // 文本展现按钮
@@ -386,12 +386,12 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
         link: true, // 文本展现按钮
         hasPermi: 'wms:supplierinvoice-request-main:financeRej'
       },
-      defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' , hide: isShowMainButton(row, ['1','8','6'])}), // 编辑
-      defaultButtons.mainListPurchasePlanCloBtn({ hasPermi: 'wms:supplierinvoice-request-main:close' ,hide: isShowMainButton(row, ['1','8','6']) }), // 关闭
+      defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' , hide: isShowMainButton(row, ['1','3','6'])}), // 编辑
+      defaultButtons.mainListPurchasePlanCloBtn({ hasPermi: 'wms:supplierinvoice-request-main:close' ,hide: isShowMainButton(row, ['1','3','6']) }), // 关闭
       {
         label: t('ts.作废'),
         name: 'repeal',
-        hide: isShowMainButton(row, ['1','8','6']),
+        hide: isShowMainButton(row, ['1','3','6']),
         type: 'danger',
         color: '',
         link: true, // 文本展现按钮
@@ -499,7 +499,7 @@ const handleImport = () => {
       })
     }
     
-    if(row && row.status == '8'){
+    if(row && (row.status == '3' ||  row.status == '7')){
       SupplierinvoiceRequestMainRules.invoiceTime[0].required = true
       SupplierinvoiceRequestMainRules.goldenTaxInvoiceNumber[0].required = true
     }else{
@@ -544,7 +544,9 @@ const handleImport = () => {
   },{
     label: t('ts.发票附件'),
     prop: 'Annex',
-    tableName:'invoice'
+    tableName:'invoice',
+    hiddenDelete:false,
+    hiddenUpload:false
   },{
     label: t('ts.货运单附件'),
     prop: 'Annex',
@@ -554,13 +556,23 @@ const handleImport = () => {
     const departmentCode = wsCache.get(CACHE_KEY.DEPT).find((account) => account.id == row.departmentCode)?.name
     if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode))
     clicKRowId.value = row.id
-    if(row.status=='1'||row.status=='2'||row.status=='3'||row.status=='6'){
+
+    // 合同附件
+    if((roleList.value.indexOf('supplier_operator')>-1||roleList.value.indexOf('purchase')>-1)&&(row.status=='1'||row.status=='2'||row.status=='3'||row.status=='6'||row.status=='7')){
       detailAnnexTable.value[0].hiddenDelete = false
       detailAnnexTable.value[0].hiddenUpload = false
     }else{
       detailAnnexTable.value[0].hiddenDelete = true
       detailAnnexTable.value[0].hiddenUpload = true
     }
+    // 发票附件
+    if(roleList.value.indexOf('supplier_operator')>-1&&(row.status=='3'||row.status=='7')){
+      detailAnnexTable.value[1].hiddenDelete = false
+      detailAnnexTable.value[1].hiddenUpload = false
+    }else{
+      detailAnnexTable.value[1].hiddenDelete = true
+      detailAnnexTable.value[1].hiddenUpload = true
+    }
     
     detailRef.value.openDetail(row, titleName, titleValue)
   }
@@ -966,11 +978,21 @@ const importSuccess = () => {
         }
       })
   }
-
+  const roleList = ref<string[]>([])
+  const getLoginUserRoleList = async ()=>{
+    let res = await SupplierinvoiceRequestMainApi.getLoginUserRoleList()
+    console.log('roleList',res)
+    if(res&&res.length>0){
+      roleList.value = res
+    }else{
+      roleList.value = []
+    }
+  }
   /** 初始化 **/
   onMounted(async () => {
     getList()
     getDefaultSupplier()
+    getLoginUserRoleList()
     importTemplateData.templateUrl = await SupplierinvoiceRequestMainApi.importTemplate()
   })
 </script>