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

1 month ago · 6b3cc450ea
13 changed files with 74 additions and 9 deletions
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@ -131,7 +131,7 @@
                            label="描述"
                            prop="inspectionJobCharacteristicsUpdateReqVO.description"
                          >
-                            <el-input
+                            <el-input show-word-limit type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
                              :disabled="true"
                            />
--- a/src/views/qms/inspectionJob/detail.vue
+++ b/src/views/qms/inspectionJob/detail.vue
@ -47,7 +47,7 @@
            </el-col>
            <el-col :span="12">
              <el-form-item label="描述" prop="inspectionJobCharacteristicsRespVO.description">
-                <el-input
+                <el-input show-word-limit type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
                  v-model="item.inspectionJobCharacteristicsRespVO.description"
                  :disabled="true"
                />
--- a/src/views/qms/inspectionRecord/addForm.vue
+++ b/src/views/qms/inspectionRecord/addForm.vue
@ -130,7 +130,7 @@
                            label="描述"
                            prop="inspectionJobCharacteristicsUpdateReqVO.description"
                          >
-                            <el-input
+                            <el-input show-word-limit type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
                              v-model="item.inspectionJobCharacteristicsUpdateReqVO.description"
                              :disabled="true"
                            />
--- a/src/views/qms/inspectionRecord/detail.vue
+++ b/src/views/qms/inspectionRecord/detail.vue
@ -47,7 +47,7 @@
            </el-col>
            <el-col :span="12">
              <el-form-item label="描述" prop="inspectionRecordCharacteristicsRespVO.description">
-                <el-input
+                <el-input show-word-limit	 type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
                  v-model="item.inspectionRecordCharacteristicsRespVO.description"
                  :disabled="true"
                />
--- a/src/views/qms/inspectionScheme/detail.vue
+++ b/src/views/qms/inspectionScheme/detail.vue
@ -66,7 +66,7 @@
              </el-col>
              <el-col :span="12">
                <el-form-item label="描述" prop="inspectionCharacteristicsBaseVO.description">
-                  <el-input v-model="item.inspectionCharacteristicsBaseVO.description" disabled/>
+                  <el-input show-word-limit type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" v-model="item.inspectionCharacteristicsBaseVO.description" disabled/>
                </el-form-item>
              </el-col>
              <el-col :span="12">
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@ -613,6 +613,7 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
+    isTableForm: false,
    isForm: false,
    isTable: true
  },
--- a/src/views/wms/basicDataManage/subject/mstr/index.vue
+++ b/src/views/wms/basicDataManage/subject/mstr/index.vue
@ -68,6 +68,7 @@ import Detail from '@/components/Detail/src/Detail.vue'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 const { loadStart, loadDone } = usePageLoading()
+// 产品类
 defineOptions({ name: 'Mstr' })

 const message = useMessage() // 消息弹窗
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@ -232,8 +232,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
    if (type == 'tableForm') {
      if(formField=='itemCode'){
        val.forEach(item=>{
-          if(tableData.value.find(item1=>item1['itemCode'] == item['code'])){
-            message.warning(`物料${item['code']}已经存在`)
+          if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode']&&item1['batch'] == item['batch'])){
+            message.warning(`物料${item['itemCode']}批次${item['batch']}已经存在`)
            return
          }
          const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@ -603,6 +603,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
      width: 150
    },
    tableForm: {
+      isRepeat:true,
      enterSearch:true,
      isInpuFocusShow: true, // 开启查询弹窗
      searchListPlaceholder: '请选择库位代码',
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@ -299,6 +299,27 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
      }
      if(formField == 'reasonCodeRequisition'){
        setV['reasonCodeRequisition'] = val[0]['code']
+        // 项目是否必填
+        if(ProductionscrapRequestMainRules['projectCode']){
+          ProductionscrapRequestMainRules['projectCode'][0].required = val[0]['isProject']=='TRUE'
+        }
+        ProductionscrapRequestMain.allSchemas.formSchema.forEach((item) => {
+          if (item.field == 'projectCode') {
+            //项目代码
+            if(val[0]['isProject']=='TRUE'){
+              //是-可编辑，可选择
+              item.componentProps.enterSearch = true
+              item.componentProps.isSearchList = true
+              item.componentProps.disabled = false
+            }else{
+              //否-不可编辑，内容为空
+              setV['projectCode'] = ''
+              item.componentProps.enterSearch = false
+              item.componentProps.isSearchList = false
+              item.componentProps.disabled = true
+            }
+          }
+        })
      }
      setV[formField] = val[0][searchField]
      tableData.value = [] // 重置明细数据
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@ -1453,6 +1453,9 @@ export const ProductionscrapRequestMain = useCrudSchemas(

 //表单校验
 export const ProductionscrapRequestMainRules = reactive({
+  projectCode: [
+    { required: false, message: '请输入项目代码', trigger: 'blur' }
+  ],
  departmentCode: [
    { required: true, message: '请输入部门', trigger: 'blur' }
  ],
--- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts
@ -475,6 +475,11 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
      searchCondition: [{
        key: 'businessType',
        value: businessTypeData.code,
+      },
+      {
+        key: 'inOrOut',
+        value: 'out',
+        isMainValue: false
      }]
    },
    form: {
@ -489,6 +494,11 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
        searchCondition: [{
          key: 'businessType',
          value: businessTypeData.code,
+        },
+        {
+          key: 'inOrOut',
+          value: 'out',
+          isMainValue: false
        }]
      }
    }
--- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts
@ -4,6 +4,7 @@ import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'

 import * as BalanceApi from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
+import * as getBusinessTypeApi  from '@/api/wms/businesstype/index'

 import { TableColumn } from '@/types/table'

@ -18,6 +19,7 @@ const queryParams = {
 const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
 const requestsettingData =data?.list[0]||{}

+ 
 // 获取当前操作人的部门
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
@ -26,6 +28,14 @@ const userDept = userStore.userSelfInfo.dept
 userDept.id = userDept.id.toString()
 const userDeptArray:any = [userDept]

+const businessTypeQueryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'ProductPutaway'
+}
+const businessTypeValue = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams)
+const businessTypeData =businessTypeValue?.list[0]||{}
+
 /**
 * @returns {Array} 制品上架申请主表
 */
@ -463,7 +473,16 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
      searchField: 'itemCode', // 查询弹窗赋值字段
      searchTitle: '库存余额信息', // 查询弹窗标题
      searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
-      searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法
+      searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'businessType',
+        value: businessTypeData.code,
+      },
+      {
+        key: 'inOrOut',
+        value: 'out',
+        isMainValue: false
+      }]
    },
    form: {
      // labelMessage: '信息提示说明！！！',
@ -473,7 +492,16 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
        searchField: 'itemCode', // 查询弹窗赋值字段
        searchTitle: '库存余额信息', // 查询弹窗标题
        searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
-        searchPage: BalanceApi.getBalancePage // 查询弹窗所需分页方法
+        searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'businessType',
+          value: businessTypeData.code,
+        },
+        {
+          key: 'inOrOut',
+          value: 'out',
+          isMainValue: false
+        }]
      }
    }
  },