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

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

@@ -18,7 +18,7 @@ export const ContainerMainRules = reactive({
 
 export const ContainerMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '单据号',
+    label: '器具号',
     field: 'number',
     sort: 'custom',
     isSearch: true,

src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue

@@ -270,7 +270,7 @@ const buttonTableClick = async (val, row) => {
       console.log(err)
     })
   } else if (val == 'mainSubmit') { // 提交审批
-    await message.confirm('确认要重新添加吗？')
+    await message.confirm('确认要提交审批吗？')
     ProductionreturnRequestMainNoApi.submit(row.id).then(() => {
       message.success(t('common.updateSuccess'))
       getList()
@@ -278,7 +278,7 @@ const buttonTableClick = async (val, row) => {
       console.log(err)
     })
   } else if (val == 'mainTurnDown') { // 驳回
-    await message.confirm('确认要重新添加吗？')
+    await message.confirm('确认要驳回吗？')
     ProductionreturnRequestMainNoApi.refused(row.id).then(() => {
       message.success(t('common.updateSuccess'))
       getList()