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

src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue

@@ -111,9 +111,9 @@
                 >
                   <el-option
                     v-for="cur in options.supplierList"
-                    :key="cur.id"
+                    :key="cur.code"
                     :label="cur.name"
-                    :value="cur.id"
+                    :value="cur.code"
                   />
                 </el-select>
               </el-form-item>

src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue

@@ -88,9 +88,9 @@
                 >
                   <el-option
                     v-for="cur in options.supplierList"
-                    :key="cur.id"
+                    :key="cur.code"
                     :label="cur.name"
-                    :value="cur.id"
+                    :value="cur.code"
                   />
                 </el-select>
               </el-form-item>

src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue

@@ -89,9 +89,9 @@
                 >
                   <el-option
                     v-for="cur in options.supplierList"
-                    :key="cur.id"
+                    :key="cur.code"
                     :label="cur.name"
-                    :value="cur.id"
+                    :value="cur.code"
                   />
                 </el-select>
               </el-form-item>

src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue

@@ -112,9 +112,9 @@
                 >
                   <el-option
                     v-for="cur in options.supplierList"
-                    :key="cur.id"
+                    :key="cur.code"
                     :label="cur.name"
-                    :value="cur.id"
+                    :value="cur.code"
                   />
                 </el-select>
               </el-form-item>

src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue

@@ -88,9 +88,9 @@
                 >
                   <el-option
                     v-for="cur in options.supplierList"
-                    :key="cur.id"
+                    :key="cur.code"
                     :label="cur.name"
-                    :value="cur.id"
+                    :value="cur.code"
                   />
                 </el-select>
               </el-form-item>

src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue

@@ -112,9 +112,9 @@
                 >
                   <el-option
                     v-for="cur in options.supplierList"
-                    :key="cur.id"
+                    :key="cur.code"
                     :label="cur.name"
-                    :value="cur.id"
+                    :value="cur.code"
                   />
                 </el-select>
               </el-form-item>

src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue

@@ -112,9 +112,9 @@
                 >
                   <el-option
                     v-for="cur in options.supplierList"
-                    :key="cur.id"
+                    :key="cur.code"
                     :label="cur.name"
-                    :value="cur.id"
+                    :value="cur.code"
                   />
                 </el-select>
               </el-form-item>

src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue

@@ -89,9 +89,9 @@
                 >
                   <el-option
                     v-for="cur in options.supplierList"
-                    :key="cur.id"
+                    :key="cur.code"
                     :label="cur.name"
-                    :value="cur.id"
+                    :value="cur.code"
                   />
                 </el-select>
               </el-form-item>

src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts

@@ -446,7 +446,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '数量',
+    label: '差异数量',
     field: 'qty',
     sort: 'custom',
     table: {

src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts

@@ -64,6 +64,8 @@ export const ContainerBindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '内容物类型',
     field: 'containerContentType',
+    dictType: DICT_TYPE.CONTAINER_CONTENT_TYPE,
+    dictClass: 'string',
     sort: 'custom',
     isSearch: true,
     form: {
@@ -103,6 +105,8 @@ export const ContainerBindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '库存状态',
     field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
     sort: 'custom',
     form: {
       component: 'Radio'
@@ -114,6 +118,8 @@ export const ContainerBindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '计量单位',
     field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts

@@ -80,6 +80,8 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '从状态',
     field: 'fromContainerStatus',
+    dictType: DICT_TYPE.CONTAINER_STATUS,
+    dictClass: 'string',
     sort: 'custom',
     isSearch: true,
     form: {
@@ -92,6 +94,8 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '到状态',
     field: 'toContainerStatus',
+    dictType: DICT_TYPE.CONTAINER_STATUS,
+    dictClass: 'string',
     sort: 'custom',
     isSearch: true,
     form: {
@@ -115,6 +119,9 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    table: {
+      width: 150
+    },
     isForm: false,
   },
   {
@@ -122,6 +129,9 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'remark',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150
+    },
   },
   {
     label: '操作',

src/views/wms/inventoryManage/containerinit/containerRepair/index.vue

@@ -154,8 +154,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:container-repair-record-main:update'}), // 编辑
+  //defaultButtons.mainListEditBtn({hasPermi:'wms:container-repair-record-main:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-repair-record-main:delete'}), // 删除
+  //defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-repair-record-main:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件

src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts

@@ -63,6 +63,8 @@ export const ContainerUnbindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '内容物类型',
     field: 'containerContentType',
+    dictType: DICT_TYPE.CONTAINER_CONTENT_TYPE,
+    dictClass: 'string',
     sort: 'custom',
     isSearch: true,
     form: {
@@ -102,6 +104,8 @@ export const ContainerUnbindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '库存状态',
     field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
     sort: 'custom',
     form: {
       component: 'Radio'
@@ -113,6 +117,8 @@ export const ContainerUnbindRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   {
     label: '计量单位',
     field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue

@@ -120,9 +120,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:containerUnbindRecordMain:create'}), // 新增
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:container-unbind-record-main:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:containerUnbindRecordMain:import'}), // 导入
+  defaultButtons.defaultImportBtn({hasPermi:'wms:container-unbind-record-main:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:containerUnbindRecordMain:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'wms:container-unbind-record-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -154,8 +154,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:containerUnbindRecordMain:update'}), // 编辑
+  //defaultButtons.mainListEditBtn({hasPermi:'wms:container-unbind-record-main:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:containerUnbindRecordMain:delete'}), // 删除
+  //defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-unbind-record-main:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件

src/views/wms/inventoryManage/containerinit/containerinitadd/containerMain.data.ts

@@ -8,26 +8,21 @@ import * as BalanceApi from "@/api/wms/balance";
 
 // 表单校验
 export const ContainerMainRules = reactive({
-  number: [
-    { required: true, message: '请输入号码', trigger: 'blur' }
-  ],
   type: [
     { required: true, message: '请选择类型', trigger: 'change' }
   ],
   status: [
     { required: true, message: '请选择状态', trigger: 'change' }
-  ],
+  ]
-  ownerCode: [
-    { required: true, message: '请选择货主代码', trigger: 'change' }
-  ],
 })
 
 export const ContainerMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '号码',
+    label: '单据号',
     field: 'number',
     sort: 'custom',
     isSearch: true,
+    isForm: false,
   },
   {
     label: '类型',

src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue

@@ -28,7 +28,7 @@
       v-model:sort="tableObject.sort"
     >
       <template #number="{row}">
-        <el-button type="primary" link @click="openDetail(row, '号码', row.number)">
+        <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
         </el-button>
       </template>

src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts

@@ -415,6 +415,12 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
 
 //表单校验
 export const ProductrepairRequestMainRules = reactive({
+  workshopCode: [
+    { required: true, message: '请选择车间代码', trigger: 'change' }
+  ],
+  dueTime: [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ],
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],

src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts

@@ -688,6 +688,7 @@ export const ProdcutscrapRecordBomDismantle = useCrudSchemas(reactive<CrudSchema
     label: '数量',
     field: 'qty',
     tableForm: {
+      disabled: true,
       type: 'InputNumber',
       min: 0,
       precision: 6

src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts

@@ -417,6 +417,12 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
 
 //表单校验
 export const ProductscrapRequestMainRules = reactive({
+  workshopCode: [
+    { required: true, message: '请选择车间代码', trigger: 'change' }
+  ],
+  dueTime: [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ],
   fromWarehouseCode: [
     { required: true, message: '请选择从仓库代码', trigger: 'change' }
   ],

src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue

@@ -187,7 +187,7 @@ const butttondata = (row) => {
         defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回
         defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过
         defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理
-        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
+        // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
     ]
 }
 

src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/index.vue

@@ -192,7 +192,7 @@ const butttondata = (row) => {
       defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回
       defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过
       defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理
-      defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
+      // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑
     ]
 }
 

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

@@ -4,6 +4,9 @@ import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as SupplieritemApi from '@/api/wms/supplieritem'
 import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+import * as PurchaseMainApi from '@/api/wms/purchaseMain'
+import * as PurchaseDetailApi from '@/api/wms/purchaseDetail'
+import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
 const { t } = useI18n() // 国际化
 
 /**
@@ -283,74 +286,140 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '单据号',
+    label: '订单号',
-    field: 'number',
+    field: 'poNumber',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择订单号',
+      searchField: 'number',
+      searchTitle: '采购订单信息',
+      searchAllSchemas: PurchaseMain.allSchemas,
+      searchPage: PurchaseMainApi.getPurchaseMainPage,
+      searchCondition: [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }, {
+        key: 'supplierCode',
+        value: 'supplierCode',
+        isMainValue: true
+      }
+        , {
+        key: 'status',
+        value: 2,
+        isMainValue: false
+      }
+      ]
+    },
     form: {
+      // labelMessage: '信息提示说明！！！',
       componentProps: {
-        disbaled: true
+        isSearchList: true,
+        searchListPlaceholder: '请选择订单号',
+        searchField: 'number',
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseMain.allSchemas,
+        searchPage: PurchaseMainApi.getPurchaseMainPage,
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
       }
     }
   },
   {
-    label: '物品代码',
+    label: '订单行',
-    field: 'itemCode',
+    field: 'poLine',
     sort: 'custom',
     table: {
       width: 150
     },
-    tableForm:{
+    form: {
-      isInpuFocusShow: true,
+      // labelMessage: '信息提示说明！！！',
-      searchListPlaceholder: '请选择供应商物品',
+      componentProps: {
-      searchField: 'itemCode',
+        isSearchList: true,
-      searchTitle: '供应商物品信息',
+        searchListPlaceholder: '请选择订单行',
-      searchAllSchemas: Supplieritem.allSchemas,
+        searchField: 'lineNumber',
-      searchPage: SupplieritemApi.getSupplieritemPage,
+        searchTitle: '采购订单信息',
+        searchAllSchemas: PurchaseDetail.allSchemas,
+        searchPage: PurchaseDetailApi.getPurchaseDetailPage,
         searchCondition: [{
-        key:'supplierCode',
+          key: 'number',
-        value:'supplierCode',
+          value: 'poNumber',
           isMainValue: true
         }, {
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-      }//, //条件，例：isMainValue: true,表示查询条件是主表的字段的值 itemCode：查询列表中字段 supplierCode：指主表某字段 
+        }]
-      // {
+      }
-      //   key:'available',
-      //   value:'TRUE',
-      //   isMainValue: false
-      // }
-      ] // 条件，例：isMainValue: false,表示查询条件不是主表的字段的值 available：查询列表中字段 TRUE：指查询具体值
     },
-    form: {
+    tableForm: {
-      // labelMessage: '信息提示说明！！！',
+      isInpuFocusShow: true,
-      componentProps: {
+      searchListPlaceholder: '请选择订单行',
-        isSearchList: true,
+      searchField: 'lineNumber',
-        searchListPlaceholder: '请选择供应商物品',
+      searchTitle: '采购订单信息',
-        searchField: 'itemCode',
+      searchAllSchemas: PurchaseDetail.allSchemas,
-        searchTitle: '供应商物品信息',
+      searchPage: PurchaseDetailApi.getPurchaseDetailPage,
-        searchAllSchemas: Supplieritem.allSchemas,
-        searchPage: SupplieritemApi.getSupplieritemPage,
       searchCondition: [{
-          key:'supplierCode',
+        key: 'number',
-          value:'supplierCode',
+        value: 'poNumber',
         isMainValue: true
       }, {
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-        }//, //条件，例：isMainValue: true,表示查询条件是主表的字段的值 itemCode：查询列表中字段 supplierCode：指主表某字段 
+      }]
-        // {
-        //   key:'available',
-        //   value:'TRUE',
-        //   isMainValue: false
-        // }
-        ] // 条件，例：isMainValue: false,表示查询条件不是主表的字段的值 available：查询列表中字段 TRUE：指查询具体值
     }
+  },
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disbaled: true
+      }
+    }
+  },
+  {
+    label: '物品代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    sort: 'custom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isSearch: true,
+    isTable: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
     }
   },
   {
@@ -414,20 +483,7 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
       precision: 6
     }
   },
-  {
+
-    label: '计量单位',
-    field: 'uom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm: {
-      type: 'Select'
-    }
-  },
   {
     label: '最后更新时间',
     field: 'updateTime',

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue

@@ -105,6 +105,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       row[formField] = val[0][searchField]
+      if (formField == 'poLine') {
+        row['itemCode'] = val[0]['itemCode']
+        row['uom'] = val[0]['uom']
+        row['available'] = val[0]['available']
+      }
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -88,19 +88,6 @@
           row['planQty'] = val[0]['orderQty']-val[0]['plannedQty']
           row['available'] = val[0]['available']
         }
-        // await PurchaseDetailApi.getPurchaseDetailPage({
-        //   number: row['poNumber'],
-        //   available: 'TRUE',
-        //   // poLine: row['lineNumber'],
-        // }).then(res => {
-        //   if (formField == 'poLine') {
-        //     row['itemCode'] = res.list[0].itemCode
-        //     row['uom'] = res.list[0].uom
-        //     row['orderQty'] = res.list[0].orderQty
-        //     row['planQty'] = res.list[0].orderQty-res.list[0].plannedQty
-        //     row['available'] = res.list[0].available
-        //   }
-        // })
       } else {
         const setV = {}
         setV[formField] = val[0][searchField]

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

@@ -185,7 +185,7 @@
       defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批
       defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过
       defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮
-      defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierdeliver-request-main:update' }), // 编辑
+      defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']),hasPermi: 'wms:supplierdeliver-request-main:update' }), // 编辑
       // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:supplierdeliver-request-main:delete' }), // 删除
       {
         label: '生成标签',