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

src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts

@@ -13,8 +13,6 @@ export const InspectionMainRules = reactive({
   requestEndTime: [required],
   batch: [required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}],
   requestInspectionNum: [required,{ validator:validateTwoNum, message: '小数点后最多2位', trigger: 'blur'}],
-  referenceOrderCode: [required],
-  referenceOrderRow: [required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}],
   referenceCertificateCode: [required],
   referenceCertificateRow: [required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}],
   inspectionType: [required],

src/views/wms/inventoryManage/package/index.vue

@@ -246,8 +246,9 @@ const formsSuccess = async (formType,data) => {
     await PackageApi.createPackage(data)
     message.success(t('common.createSuccess'))
   } else {
+    await message.confirm('包装修改后需重新打印标签，是否继续保存？')
     await PackageApi.updatePackage(data)
-    message.success(t('common.updateSuccess'))
+    message.success(t('包装信息已修改，请重新打印标签'))
   }
   basicFormRef.value.dialogVisible = false
   getList()

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

@@ -148,7 +148,7 @@
   </BasicForm>
 
   <!-- 标签打印 -->
-  <SearchTable ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
+  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
 
  
 </template>

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

@@ -1692,7 +1692,15 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
       width: 150,
     },
   },
-{
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
     label: '计量单位',
     field: 'uom',
     sort: 'custom',
@@ -1705,12 +1713,5 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
       width: 150,
     },
   },
-{
+
-    label: '数量',
-    field: 'qty',
-    sort: 'custom',
-    table: {
-      width: 150,
-    },
-  },
 ]))