昨天把已完成变成完成

api_v2.md

@@ -5,7 +5,7 @@
 
 
 - [ ] 未完成任务
-- [x] 已完成任务
+- [x] 完成任务
 
 
 ``` java

common/src/main/ets/utils/dict.ets

@@ -62,7 +62,7 @@ const military_depot_dict = [{
 },
   {
     id: 2,
-    text: '已完成',
+    text: '完成',
     value: 1
   },
   {

entry/src/main/ets/pages/metailmange/WzConversionPage/WzConversionPage.ets

@@ -103,7 +103,7 @@ struct WzConversionPage{
   onSubmit() {
     try{
       this.checkedList.forEach(async (element)=>{
-        let num = await wzcrkModel.updateWzcrkWczt(element, (this.radioChecked == undefined || this.radioChecked ? '已完成' : '未完成'))
+        let num = await wzcrkModel.updateWzcrkWczt(element, (this.radioChecked == undefined || this.radioChecked ? '完成' : '未完成'))
         if(num) {
           this.dataSource.splice(this.dataSource.findIndex(i => i.guid == element), 1)
         }
@@ -133,7 +133,7 @@ struct WzConversionPage{
   }
   onExportSubmit() {
     this.checkedList.forEach(async element => {
-      let res = await ViewdrdcModel.queryExport({guid: element, wczt: '已完成', pzlx: '17'})
+      let res = await ViewdrdcModel.queryExport({guid: element, wczt: '完成', pzlx: '17'})
       const jhguidArr = res.map((item) => item.guid)
       if (jhguidArr && jhguidArr.length > 0) {
         const date = dateUtils.formatDateTime(new Date(), 'before')

entry/src/main/ets/pages/metailmange/WzExchangePage/WzExchangePage.ets

@@ -102,7 +102,7 @@ struct WzExchangePage{
   onSubmit() {
     try{
       this.checkedList.forEach(async (element)=>{
-        let num = await wzcrkModel.updateWzcrkWczt(element, (this.radioChecked == undefined || this.radioChecked ? '已完成' : '未完成'))
+        let num = await wzcrkModel.updateWzcrkWczt(element, (this.radioChecked == undefined || this.radioChecked ? '完成' : '未完成'))
         if(num) {
           this.dataSource.splice(this.dataSource.findIndex(i => i.guid == element), 1)
         }
@@ -132,7 +132,7 @@ struct WzExchangePage{
   }
   onExportSubmit() {
     this.checkedList.forEach(async element => {
-      let res = await ViewdrdcModel.queryExport({guid: element, wczt: '已完成', pzlx: '17'})
+      let res = await ViewdrdcModel.queryExport({guid: element, wczt: '完成', pzlx: '17'})
       const jhguidArr = res.map((item) => item.guid)
       if (jhguidArr && jhguidArr.length > 0) {
         const date = dateUtils.formatDateTime(new Date(), 'before')
@@ -252,7 +252,7 @@ struct WzExchangePage{
               })
             } else if (this.dataSource.filter(i => i.wczt == '未完成').length > 0) {
               promptAction.showToast({
-                message: '请选择已完成的单据'
+                message: '请选择完成的单据'
               })
             } else {
               if (this.exportDialogController != undefined) {

entry/src/main/ets/pages/metailmange/WzInPage/WzInPage.ets

@@ -45,8 +45,8 @@ export struct WzInPage {
   }
   private controller: TabsController = new TabsController()
   private searchcontroller: SearchController = new SearchController()
-  @State defaultSelectValue: Array<SelectOption> = [{ value: "未完成" }, { value: "已完成" }]
-  @State selectValue: Array<SelectOption> = [{ value: "未完成" }, { value: "已完成" }, { value: "完成已绑定" }]
+  @State defaultSelectValue: Array<SelectOption> = [{ value: "未完成" }, { value: "完成" }]
+  @State selectValue: Array<SelectOption> = [{ value: "未完成" }, { value: "完成" }, { value: "完成已绑定" }]
   @State page: number = 1
   @State rows: number = 10
   @State sjlx: string = "0"
@@ -131,7 +131,7 @@ export struct WzInPage {
   onSubmit() {
    try{
      this.checkedList.forEach(async (element)=>{
-       let num = await wzcrkModel.updateWzcrkWczt(element, (this.radioChecked == undefined || this.radioChecked ? '已完成' : '未完成'))
+       let num = await wzcrkModel.updateWzcrkWczt(element, (this.radioChecked == undefined || this.radioChecked ? '完成' : '未完成'))
        if(num) {
          this.dataSource.splice(this.dataSource.findIndex(i => i.guid == element), 1)
        }
@@ -162,7 +162,7 @@ export struct WzInPage {
 
   onExportSubmit() {
     this.checkedList.forEach(async element => {
-      let res = await ViewdrdcModel.queryExport({guid: element, wczt: '已完成', pzlx: '14'})
+      let res = await ViewdrdcModel.queryExport({guid: element, wczt: '完成', pzlx: '14'})
       const jhguidArr = res.map((item) => item.guid)
       if (jhguidArr && jhguidArr.length > 0) {
         const date = dateUtils.formatDateTime(new Date(), 'before')
@@ -469,7 +469,7 @@ export struct WzInPage {
               })
             } else if (this.dataSource.filter(i => i.wczt == '未完成').length > 0) {
               promptAction.showToast({
-                message: '请选择已完成的单据'
+                message: '请选择完成的单据'
               })
             } else {
               if (this.exportDialogController != undefined) {
@@ -580,7 +580,7 @@ export struct WzInPage {
                   }})
                 })
               })
-            }.padding(18)
+            }.padding(15)
           }
 
 

entry/src/main/ets/pages/metailmange/WzInvPage.ets

@@ -93,7 +93,7 @@ struct WzInvPage{
 
           TabContent() {
             // Column().width('100%').height('100%').backgroundColor('#007DFF')
-          }.tabBar(this.TabBuilder(1, '已完成'))
+          }.tabBar(this.TabBuilder(1, '完成'))
         }
         .height(80)
         .margin({top:-15})

entry/src/main/ets/pages/metailmange/WzInvPage/WzInvPage.ets

@@ -48,7 +48,7 @@ struct WzInvPage{
     pzh: this.pzh,
     page: this.page,
     rows: this.rows,
-    sjlx: this.currentIndex === 0 ? "未完成" : "已完成",
+    sjlx: this.currentIndex === 0 ? "未完成" : "完成",
     wczt: "未完成"
   }
   itemClick() {
@@ -62,7 +62,7 @@ struct WzInvPage{
     const res = await wzcrkModel.query({
       pzlx: "42",
       pzh: this.searchData.pzh,
-      wczt: this.currentIndex === 0 ? "未完成" : "已完成" })
+      wczt: this.currentIndex === 0 ? "未完成" : "完成" })
     res.forEach(element => {
       this.dataSource.push(new WzClass(element))
     });
@@ -114,7 +114,7 @@ struct WzInvPage{
   onSubmit() {
     try{
       this.checkedList.forEach(async (element)=>{
-        let num = await wzcrkModel.updateWzcrkWczt(element, (this.radioChecked == undefined || this.radioChecked ? '已完成' : '未完成'))
+        let num = await wzcrkModel.updateWzcrkWczt(element, (this.radioChecked == undefined || this.radioChecked ? '完成' : '未完成'))
         if(num) {
           this.dataSource.splice(this.dataSource.findIndex(i => i.guid == element), 1)
         }
@@ -143,7 +143,7 @@ struct WzInvPage{
   }
   onExportSubmit() {
     this.checkedList.forEach(async element => {
-      let res = await ViewdrdcModel.queryExport({guid: element, wczt: '已完成', pzlx: '17'})
+      let res = await ViewdrdcModel.queryExport({guid: element, wczt: '完成', pzlx: '17'})
       const jhguidArr = res.map((item) => item.guid)
       if (jhguidArr && jhguidArr.length > 0) {
         const date = dateUtils.formatDateTime(new Date(), 'before')
@@ -252,7 +252,7 @@ struct WzInvPage{
             })
           } else if (this.dataSource.filter(i => i.wczt == '未完成').length > 0) {
             promptAction.showToast({
-              message: '请选择已完成的单据'
+              message: '请选择完成的单据'
             })
           } else {
             if (this.exportDialogController != undefined) {
@@ -304,7 +304,7 @@ struct WzInvPage{
 
           TabContent() {
             // Column().width('100%').height('100%').backgroundColor('#007DFF')
-          }.tabBar(this.TabBuilder(1, '已完成'))
+          }.tabBar(this.TabBuilder(1, '完成'))
         }
         .height(80)
         .margin({top:-15})

entry/src/main/ets/pages/metailmange/WzOutPage/WzOutPage.ets

@@ -41,8 +41,8 @@ export struct WzOutPage {
   }
   private controller: TabsController = new TabsController()
   private searchcontroller: SearchController = new SearchController()
-  @State defaultSelectValue: Array<SelectOption> = [{ value: "未完成" }, { value: "已完成" }]
-  @State selectValue: Array<SelectOption> = [{ value: "未完成" }, { value: "已完成" }, { value: "完成已绑定" }]
+  @State defaultSelectValue: Array<SelectOption> = [{ value: "未完成" }, { value: "完成" }]
+  @State selectValue: Array<SelectOption> = [{ value: "未完成" }, { value: "完成" }, { value: "完成已绑定" }]
 
   itemClick() {
     router.pushUrl({url:'pages/order_detail/PzInOutDetailPage'})
@@ -114,7 +114,7 @@ export struct WzOutPage {
   onSubmit() {
     try{
       this.checkedList.forEach(async (element)=>{
-        let num = await wzcrkModel.updateWzcrkWczt(element, (this.radioChecked == undefined || this.radioChecked ? '已完成' : '未完成'))
+        let num = await wzcrkModel.updateWzcrkWczt(element, (this.radioChecked == undefined || this.radioChecked ? '完成' : '未完成'))
         if(num) {
           this.dataSource.splice(this.dataSource.findIndex(i => i.guid == element), 1)
         }
@@ -145,7 +145,7 @@ export struct WzOutPage {
 
   onExportSubmit() {
     this.checkedList.forEach(async element => {
-      let res = await ViewdrdcModel.queryExport({guid: element, wczt: '已完成', pzlx: '17'})
+      let res = await ViewdrdcModel.queryExport({guid: element, wczt: '完成', pzlx: '17'})
       const jhguidArr = res.map((item) => item.guid)
       if (jhguidArr && jhguidArr.length > 0) {
         const date = dateUtils.formatDateTime(new Date(), 'before')
@@ -277,7 +277,7 @@ export struct WzOutPage {
               })
             } else if (this.dataSource.filter(i => i.wczt == '未完成').length > 0) {
               promptAction.showToast({
-                message: '请选择已完成的单据'
+                message: '请选择完成的单据'
               })
             } else {
               if (this.exportDialogController != undefined) {

entry/src/main/ets/pages/metailmange/WzPositionPage.ets

@@ -19,7 +19,7 @@ struct WzPositionPage{
   @State selectedFontColor: string = '#fff'
   @State currentIndex: number = 0
   @State titleBarPadding:number=0
-  @State selectValue: Array<SelectOption> = [{ value: "未完成" }, { value: "已完成" }, { value: "完成已绑定" }]
+  @State selectValue: Array<SelectOption> = [{ value: "未完成" }, { value: "完成" }, { value: "完成已绑定" }]
   itemClick() {
     router.pushUrl({url:'pages/order_detail/PzPourStoragePage'})
   }

entry/src/main/ets/pages/metailmange/WzReversePage.ets

@@ -88,7 +88,7 @@ struct WzReversePage{
 
           TabContent() {
             // Column().width('100%').height('100%').backgroundColor('#007DFF')
-          }.tabBar(this.TabBuilder(1, '已完成'))
+          }.tabBar(this.TabBuilder(1, '完成'))
         }
         .height(60)
         .margin({top:-15})

entry/src/main/ets/pages/metailmange/WzReversePage/WzReversePage.ets

@@ -55,7 +55,7 @@ struct WzReversePage{
     const res = await wzcrkModel.query({
       pzlx: "19",
       pzh: this.searchData.pzh,
-      wczt: this.currentIndex === 0 ? "未完成" : "已完成" })
+      wczt: this.currentIndex === 0 ? "未完成" : "完成" })
     res.forEach(element => {
       this.dataSource.push(new WzClass(element))
     });
@@ -107,7 +107,7 @@ struct WzReversePage{
   onSubmit() {
     try{
       this.checkedList.forEach(async (element)=>{
-        let num = await wzcrkModel.updateWzcrkWczt(element, (this.radioChecked == undefined || this.radioChecked ? '已完成' : '未完成'))
+        let num = await wzcrkModel.updateWzcrkWczt(element, (this.radioChecked == undefined || this.radioChecked ? '完成' : '未完成'))
         if(num) {
           this.dataSource.splice(this.dataSource.findIndex(i => i.guid == element), 1)
         }
@@ -136,7 +136,7 @@ struct WzReversePage{
   }
   onExportSubmit() {
     this.checkedList.forEach(async element => {
-      let res = await ViewdrdcModel.queryExport({guid: element, wczt: '已完成', pzlx: '17'})
+      let res = await ViewdrdcModel.queryExport({guid: element, wczt: '完成', pzlx: '17'})
       const jhguidArr = res.map((item) => item.guid)
       if (jhguidArr && jhguidArr.length > 0) {
         const date = dateUtils.formatDateTime(new Date(), 'before')
@@ -245,7 +245,7 @@ struct WzReversePage{
               })
             } else if (this.dataSource.filter(i => i.wczt == '未完成').length > 0) {
               promptAction.showToast({
-                message: '请选择已完成的单据'
+                message: '请选择完成的单据'
               })
             } else {
               if (this.exportDialogController != undefined) {
@@ -297,7 +297,7 @@ struct WzReversePage{
 
           TabContent() {
             // Column().width('100%').height('100%').backgroundColor('#007DFF')
-          }.tabBar(this.TabBuilder(1, '已完成'))
+          }.tabBar(this.TabBuilder(1, '完成'))
         }
         .height(80)
         .margin({top:-15})