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

src/views/home/components/material.vue

@@ -32,7 +32,8 @@
       </div>
     </div>
     <div class="two-row mt-14px">
-      <div class="data1 w-[47.3%]">
+      <div class="data1 w-[47.3%]" >
+        <!-- 呆滞库存预警 -->
         <div class="title">{{ t('home.slack_stock_warning')}}</div>
         <el-table
           :data="materialData?.stagnantBalanceList"
@@ -87,8 +88,19 @@
             </template>
           </el-table-column>
         </el-table>
+        <!-- <el-pagination style="margin-top:10px"
+          v-model:current-page="currentPage_stagnantBalance"
+          v-model:page-size="pageSize_stagnantBalance"
+          :page-sizes="[10, 20, 30, 50, 100]"
+          :small="true"
+          :background="false"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total_stagnantBalance"
+          @current-change="handleCurrentChange_stagnantBalance"
+        /> -->
       </div>
       <div class="data1 w-[47.3%]">
+        <!-- 超期库存预警 -->
         <div class="title">{{ t('home.overstock_warning') }}</div>
         <el-table
           :data="materialData?.overdueBalanceList"
@@ -143,10 +155,21 @@
             </template>
           </el-table-column>
         </el-table>
+        <!-- <el-pagination style="margin-top:10px"
+          v-model:current-page="currentPage_overdueBalance"
+          v-model:page-size="pageSize_overdueBalance"
+          :page-sizes="[10, 20, 30, 50, 100]"
+          :small="true"
+          :background="false"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total_overdueBalance"
+          @current-change="handleCurrentChange_overdueBalance"
+        /> -->
       </div>
     </div>
     <div class="two-row mt-14px">
       <div class="data1 w-[47.3%]">
+        <!-- 高低储预警 -->
         <div class="title">{{ t('home.high_and_low_storage_warning') }}</div>
         <el-table
           :data="materialData?.warningBalanceList"
@@ -201,8 +224,19 @@
             </template>
           </el-table-column>
         </el-table>
+        <!-- <el-pagination style="margin-top:10px"
+          v-model:current-page="currentPage_warningBalance"
+          v-model:page-size="pageSize_warningBalance"
+          :page-sizes="[10, 20, 30, 50, 100]"
+          :small="true"
+          :background="false"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total_warningBalance"
+          @current-change="handleCurrentChange_warningBalance"
+        /> -->
       </div>
       <div class="data1  w-[47.3%]">
+        <!-- 待处理任务 -->
         <div class="title">{{ t('home.waiting_tasks') }}</div>
         <Echart :options="barOptions" :height="280" :key="lineIndex" />
       </div>
@@ -222,8 +256,8 @@ const lineIndex = ref(0)
 
 const materialData = ref()
 // 获取原料管理员数据
-const getMaterialData = async () => {
+const getMaterialData =  () => {
- await IndexApi.getMaterialData().then((res) => {
+  IndexApi.getMaterialData().then((res) => {
     materialData.value = res
     getJobCharts()
   })
@@ -250,9 +284,33 @@ const getJobCharts = async () => {
   ])
   lineIndex.value++
 }
-onMounted(async () => {
+onMounted(() => {
-  // await getMaterialData()
+  // getMaterialData()
 })
+
+// 呆滞库存预警
+const currentPage_stagnantBalance = ref(1)
+const pageSize_stagnantBalance = ref(10)
+const total_stagnantBalance= ref(100)
+const handleCurrentChange_stagnantBalance = (val)=>{
+  console.log('呆滞库存预警',val)
+}
+
+// 超期库存预警
+const currentPage_overdueBalance = ref(1)
+const pageSize_overdueBalance = ref(10)
+const total_overdueBalance= ref(100)
+const handleCurrentChange_overdueBalance = (val)=>{
+  console.log('超期库存预警',val)
+}
+
+// 高低储预警
+const currentPage_warningBalance = ref(1)
+const pageSize_warningBalance = ref(10)
+const total_warningBalance= ref(100)
+const handleCurrentChange_warningBalance = (val)=>{
+  console.log('高低储预警',val)
+}
 </script>
 <style scoped lang="scss">
 .title {

src/views/home/components/produce.vue

@@ -201,8 +201,8 @@ const getJobCharts = async () => {
   ])
   lineIndex.value++
 }
-onMounted(async () => {
+onMounted( () => {
-  // await getProduceData()
+  // getProduceData()
 })
 </script>
 <style scoped lang="scss">

src/views/home/components/product.vue

@@ -11,7 +11,8 @@
       </div>
     </div>
     <div class="two-row mt-14px">
-      <div class="data1 w-[47.3%]">
+      <div class="data1 w-[47.3%]" style="border:1px solid red">
+        <!-- 呆滞库存预警 -->
         <div class="title">{{ t('home.slack_stock_warning') }}</div>
         <el-table
           :data="productData?.stagnantBalanceList"
@@ -68,6 +69,7 @@
         </el-table>
       </div>
       <div class="data1 w-[47.3%]">
+        <!-- 超期库存预警 -->
         <div class="title">{{ t('home.overstock_warning') }}</div>
         <el-table
           :data="productData?.overdueBalanceList"
@@ -126,6 +128,7 @@
     </div>
     <div class="two-row mt-14px">
       <div class="data1 w-[47.3%]">
+        <!-- 高低储预警 -->
         <div class="title">{{ t('home.high_and_low_storage_warning') }}</div>
         <el-table
           :data="productData?.warningBalanceList"
@@ -182,6 +185,7 @@
         </el-table>
       </div>
       <div class="data1 w-[47.3%]">
+        <!-- 待处理任务 -->
         <div class="title">{{ t('home.waiting_tasks') }}</div>
         <Echart :options="barOptions" :height="280" :key="lineIndex" />
       </div>
@@ -228,8 +232,8 @@ const getJobCharts = async () => {
   ])
   lineIndex.value++
 }
-onMounted(async () => {
+onMounted( () => {
-  // await getProductData()
+  // getProductData()
 })
 </script>
 <style scoped lang="scss">

src/views/home/components/supplierIndex.vue

@@ -354,8 +354,8 @@ const formatter = (type,dict) => {
   let str = getStrDictOptions(dict).filter((item) => type == item.value)[0]?.label
   return str
 }
-onMounted(async () => {
+onMounted( () => {
-  // await getSupplierData()
+  // getSupplierData()
   getList()
 })
 </script>

src/views/home/index.vue

@@ -1,9 +1,14 @@
 <template>
   <div>
-    <supplierIndex v-hasRole="['super_admin','supplier']"/>
+    <!-- <supplierIndex v-hasRole="['super_admin','supplier']"/>
-    <material v-hasRole="['super_admin']"/>
+    <material  v-hasRole="['super_admin']"/>
-    <product v-hasRole="['super_admin']"/>
+    <product  v-hasRole="['super_admin']"/>
-    <produce v-hasRole="['super_admin']"/>
+    <produce  v-hasRole="['super_admin']"/> -->
+    <supplierIndex />
+    <material/>
+    <!-- 和 material 中四个table重复了，先去掉了 -->
+    <!-- <product/> --> 
+    <produce/>
   </div>
 </template>
 <script lang="ts" setup>

src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue

@@ -137,11 +137,13 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => {
         key: 'businessType',
         value: businessType,
         isMainValue: false
-      },{
+      }
-          key: 'available',
+      // ,{
-          value: 'TRUE',
+      //     key: 'available',
-          isMainValue: false
+      //     value: 'TRUE',
-      },{
+      //     isMainValue: false
+      // }
+      ,{
         message: '请选择从仓库代码！',
         key: 'warehouseCode',
         value: 'fromWarehouseCode',
@@ -153,11 +155,13 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => {
         key: 'businessType',
         value: businessType,
         isMainValue: false
-      },{
+      },
-          key: 'available',
+      // {
-          value: 'TRUE',
+      //     key: 'available',
-          isMainValue: false
+      //     value: 'TRUE',
-        },{
+      //     isMainValue: false
+      //   },
+        {
           message: '请选择从仓库代码！',
           key: 'warehouseCode',
           value: 'fromWarehouseCode',

src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts

@@ -324,11 +324,12 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
       searchPage: BalanceApi.getBalanceByBusinessTypeByItemType, // 查询弹窗所需分页方法
       searchCondition:[
-        {
+        // {
-          key: 'available',
+        //   key: 'available',
-          value: 'TRUE',
+        //   value: 'TRUE',
-          isMainValue: false
+        //   isMainValue: false
-        },{
+        // }
+        ,{
           message: '请选择从仓库代码！',
           key: 'fromWarehouseCode',
           value: 'fromWarehouseCode',

src/views/wms/basicDataManage/systemSetting/supplierUser/index.vue

@@ -74,7 +74,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
-
+// 供应商用户关联管理
 defineOptions({ name: 'SupplierUser' })
 
 const message = useMessage() // 消息弹窗

src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts

@@ -87,6 +87,7 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        dialogWidth:'1025px',//搜索出来弹窗的宽度
         isSearchList: true,
         searchListPlaceholder: '请选用户信息',
         searchField: 'id',

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@@ -868,6 +868,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTableForm:false,
     isForm:false,
   },
   {
@@ -878,6 +879,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTableForm:false,
     isForm:false,
   },
   {
@@ -887,6 +889,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    isTableForm:false,
     isForm:false,
   },
   {

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@@ -558,10 +558,24 @@ const importSuccess = () => {
 
 // 筛选提交
 const searchFormClick = (searchData) => {
-  tableObject.params = {
+  tableObject.params.isSearch = true
-    isSearch: true,
+  let filters = [...searchData.filters]
-    filters: searchData.filters
+  if(!filters.find(item=>item.column=='business_type')){
+    if ( routeName.value == 'DeliverRequestMain') {
+      filters = [...filters,{
+        action:'==',      
+        column:'business_type',      
+        value:'Deliver',
+      }]
+    } else if ( routeName.value == 'ZZBJDeliverRequestMain') {
+      filters = [...filters,{
+        action:'==',      
+        column:'business_type',      
+        value:'ZZBJDeliver',
+      }]
+    }
   }
+  tableObject.params.filters = filters
   getList() // 刷新当前列表
 }
 

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue

@@ -109,10 +109,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       row[formField] = val[0][searchField]
+      row['uom'] = val[0]['uom']
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]
-      //setV['ppNumber'] = val[0]['ppNumber']
       //setV['supplierCode'] = val[0]['supplierCode']
       formRef.setValues(setV)
     }

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts

@@ -501,7 +501,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true
     }
   },
   {

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

@@ -114,7 +114,7 @@
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/productreceipt-request-main/import" :importTemplateData="importTemplateData" 
-  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+  @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'scrap'"/>
   <!-- 标签打印 -->
   <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
 </template>
@@ -729,4 +729,4 @@ onMounted(async () => {
   getList()
   importTemplateData.templateUrl = await ProductreceiptRequestMainApi.importTemplate()
 })
-</script>
+</script>

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts

@@ -678,7 +678,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     },
     sortTableDefault: 1013,
     hiddenInMain: true,
-    isSearch: true
+    isSearch: false
   },
   {
     label: '原因',

src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts

@@ -810,15 +810,15 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     hiddenInMain:true,
     isForm: false,
-    form: {
+    // form: {
-      component: 'DatePicker',
+    //   component: 'DatePicker',
-      componentProps: {
+    //   componentProps: {
-        style: {width:'100%'},
+    //     style: {width:'100%'},
-        type: 'datetime',
+    //     type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    //     dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+    //     valueFormat: 'x',
-      }
+    //   }
-    }
+    // }
   },
   {
     label: '最后更新时间',
@@ -834,6 +834,15 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
   },
   {
     label: '备注',

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue

@@ -257,8 +257,9 @@ const getSearchTableData = async (number,formField,searchField)=>{
   }).then((res)=>{
     res.list.forEach((item,index)=>{
       const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
-      findItem['expireTime'] = findItem['expireTime']
+      if(findItem){
-
+        findItem['expireTime'] = findItem['expireTime']
+      }
     })
   })
 }

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

@@ -298,7 +298,7 @@
     return []
   }
     return [
-      defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['1','6']) ,hasPermi: 'wms:supplierinvoice-request-main:open'}), // 打开
+      defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['9']) ,hasPermi: 'wms:supplierinvoice-request-main:open'}), // 打开
       defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1','6']),hasPermi: 'wms:supplierinvoice-request-main:sub' }), // 提交审批
       {
         label: t('ts.采购通过'),