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

4 months ago · 2dcc20734c
19 changed files with 27 additions and 19 deletions
--- a/src/views/qms/aql/index.vue
+++ b/src/views/qms/aql/index.vue
@ -16,7 +16,7 @@

  <!-- 列表 -->
  <ContentWrap>
-    <Table
+    <Table v-clientTable
      :columns="tableColumns"
      :data="tableObject.tableList"
      :loading="tableObject.loading"
--- a/src/views/qms/counter/index.vue
+++ b/src/views/qms/counter/index.vue
@ -16,7 +16,7 @@

  <!-- 列表 -->
  <ContentWrap>
-    <Table
+    <Table v-clientTable
      :columns="tableColumns"
      :data="tableObject.tableList"
      :loading="tableObject.loading"
--- a/src/views/qms/dynamicRule/index.vue
+++ b/src/views/qms/dynamicRule/index.vue
@ -16,7 +16,7 @@

  <!-- 列表 -->
  <ContentWrap>
-    <Table
+    <Table v-clientTable
      :columns="tableColumns"
      :data="tableObject.tableList"
      :loading="tableObject.loading"
--- a/src/views/qms/inspectionJob/index.vue
+++ b/src/views/qms/inspectionJob/index.vue
@ -20,7 +20,7 @@

  <!-- 列表 -->
  <ContentWrap>
-    <Table
+    <Table v-clientTable
      :columns="tableColumns"
      :data="tableObject.tableList"
      :loading="tableObject.loading"
--- a/src/views/qms/inspectionMethod/index.vue
+++ b/src/views/qms/inspectionMethod/index.vue
@ -16,7 +16,7 @@

  <!-- 列表 -->
  <ContentWrap>
-    <Table
+    <Table v-clientTable
      :columns="tableColumns"
      :data="tableObject.tableList"
      :loading="tableObject.loading"
--- a/src/views/qms/inspectionRecord/index.vue
+++ b/src/views/qms/inspectionRecord/index.vue
@ -11,7 +11,7 @@

  <!-- 列表 -->
  <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <Table v-clientTable :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
        total: tableObject.total
      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
      v-model:sort="tableObject.sort">
--- a/src/views/qms/inspectionRequest/index.vue
+++ b/src/views/qms/inspectionRequest/index.vue
@ -12,7 +12,7 @@

  <!-- 列表 -->
  <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <Table v-clientTable :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
        total: tableObject.total
      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
      v-model:sort="tableObject.sort">
--- a/src/views/qms/inspectionScheme/index.vue
+++ b/src/views/qms/inspectionScheme/index.vue
@ -16,7 +16,7 @@

  <!-- 列表 -->
  <ContentWrap>
-    <Table
+    <Table v-clientTable
      :columns="tableColumns"
      :data="tableObject.tableList"
      :loading="tableObject.loading"
--- a/src/views/qms/inspectionStage/index.vue
+++ b/src/views/qms/inspectionStage/index.vue
@ -16,7 +16,7 @@

  <!-- 列表 -->
  <ContentWrap>
-    <Table
+    <Table v-clientTable
      :columns="tableColumns"
      :data="tableObject.tableList"
      :loading="tableObject.loading"
--- a/src/views/qms/inspectionTemplate/index.vue
+++ b/src/views/qms/inspectionTemplate/index.vue
@ -16,7 +16,7 @@

  <!-- 列表 -->
  <ContentWrap>
-    <Table
+    <Table v-clientTable
      :columns="tableColumns"
      :data="tableObject.tableList"
      :loading="tableObject.loading"
--- a/src/views/qms/qualityNotice/index.vue
+++ b/src/views/qms/qualityNotice/index.vue
@ -11,7 +11,7 @@

  <!-- 列表 -->
  <ContentWrap>
-    <Table :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <Table  v-clientTable :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
        total: tableObject.total
      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
      v-model:sort="tableObject.sort">
--- a/src/views/qms/sampleCode/index.vue
+++ b/src/views/qms/sampleCode/index.vue
@ -16,7 +16,7 @@

  <!-- 列表 -->
  <ContentWrap>
-    <Table
+    <Table v-clientTable
      :columns="tableColumns"
      :data="tableObject.tableList"
      :loading="tableObject.loading"
--- a/src/views/qms/samplingProcess/index.vue
+++ b/src/views/qms/samplingProcess/index.vue
@ -16,7 +16,7 @@

  <!-- 列表 -->
  <ContentWrap>
-    <Table
+    <Table v-clientTable
      :columns="tableColumns"
      :data="tableObject.tableList"
      :loading="tableObject.loading"
--- a/src/views/qms/samplingScheme/index.vue
+++ b/src/views/qms/samplingScheme/index.vue
@ -16,7 +16,7 @@

  <!-- 列表 -->
  <ContentWrap>
-    <Table
+    <Table v-clientTable
      :columns="tableColumns"
      :data="tableObject.tableList"
      :loading="tableObject.loading"
--- a/src/views/qms/selectedSet/index.vue
+++ b/src/views/qms/selectedSet/index.vue
@ -16,7 +16,7 @@

  <!-- 列表 -->
  <ContentWrap>
-    <Table
+    <Table v-clientTable
      :columns="tableColumns"
      :data="tableObject.tableList"
      :loading="tableObject.loading"
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue
@ -28,7 +28,7 @@
  </ContentWrap>

  <!-- 表单弹窗：添加/修改 -->
-  <BasicForm ref="basicFormRef" 
+  <BasicForm ref="basicFormRef"
    :isOpenSearchTable="true"
    fieldTableColumn="itemCode" 
    @success="getList"
@ -41,7 +41,8 @@
    :apiCreate="RelegateRequestMainApi.createRelegateRequestMain" 
    :isBusiness="true" fromeWhere="RelegateRequestMain"
    @handleAddTable="handleAddTable" 
-    @handleDeleteTable="handleDeleteTable" 
+    @handleDeleteTable="handleDeleteTable"
+    :isShowReduceButtonSelection="true"
    @searchTableSuccess="searchTableSuccess"
    @submitForm="submitForm"
    :isShowButton=isShowButton />
--- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
+++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts
@ -630,7 +630,10 @@ export const StockupDetailJob = useCrudSchemas(reactive<CrudSchema[]>([
  {
    label: '操作',
    field: 'action',
-    isForm: false,
+    isSearch: false,
+    isTable: false,
+    isForm:false,
+    isDetail:false,
    hiddenInMain: true,
    table: {
      width: 150,
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue
@ -136,10 +136,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
        // 入库存包装规格
        row[formField] = val[0][searchField]
        row['balancePackUnit'] = val[0]['packUnit']
+      }else{
+        row[formField] = val[0][searchField]
      }
    } else {
      const setV = {}
-      
+
      setV[formField] = val[0][searchField]
      //setV['supplierCode'] = val[0]['supplierCode']
      formRef.setValues(setV)
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@ -235,6 +235,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
          newRow[formField] = item[searchField]
          tableData.value.push(newRow)
        })
+      }else{
+        row[formField] = val[0][searchField]
      }
      
    } else {