src/api/common/index.ts

@@ -112,7 +112,7 @@ export function updateCAREER_ASSISTANCE(queryParams: any) {
 
 export function undoCommit(queryParams: any) {
   return request({
-    url: '/api/api/MaterialUndo/commitUndo',
+    url: '/api/MaterialUndo/commitUndo',
     method: 'post',
     data: queryParams,
   });

src/api/label/index.ts

@@ -46,7 +46,7 @@ export function Getprinter(data: any) {
  */
 export function updateRemark(data: any) {
   return request({
-    url: '/api/api/label/updateRemark',
+    url: '/api/label/updateRemark',
     method: 'post',
     data: data,
   });
@@ -57,7 +57,7 @@ export function updateRemark(data: any) {
  */
 export function updateTruegg(data: any) {
   return request({
-    url: '/api/api/label/updateTruegg',
+    url: '/api/label/updateTruegg',
     method: 'post',
     data: data,
   });
@@ -97,7 +97,7 @@ export function getSpecList(data: any) {
 
 export function labelMaterial(data: any) {
   return request({
-    url: '/api/api/label/labelMaterial',
+    url: '/api/label/labelMaterial',
     method: 'post',
     data: data,
   });

src/views/Query/StockQuery/Invoice/index.vue

@@ -26,7 +26,7 @@
                       <el-form-item label="料号" prop="MATERIALSPECNAME">
                         <el-Input v-model="queryParams.MATERIALSPECNAME" clearable />
                       </el-form-item>
-                    </el-col>
+                    </el-col>   
                     <el-col :span="6">
                       <el-form-item label="品名" prop="DESC_CN">
                         <el-Input v-model="queryParams.DESC_CN" clearable />
@@ -229,7 +229,6 @@ function handleQueryInfo() {
   state.page.pageNum = 1
   state.page_d.pageNum = 1
   state.page.total = 0
-  state.page_d.total = 0;
   handleQuery()
 }
 function handleQuery() {
@@ -248,18 +247,22 @@ function handleQuery() {
                 pageNum: state.page.pageNum,
                 pageSize: state.page.pageSize,
             }).then((res: any) => {
-              state.list = res.data.list;
+              if(res.data.list.length == 0){
-              state.page.total = res.data.total;
+                ElMessageBox.alert('查无数据', '提醒框', {
-              state.loading = false
+                  confirmButtonText: 'OK',
-              if (state.list.length > 0) {
+                })
-                for (const element of state.list) {
+                state.loading = false
-                  let dates = new Date(element.ORDERDATE).toJSON()
+              } else {
-                  element.ORDERDATE = new Date(+new Date(dates) + 8 * 3600 * 1000)
+
-                    .toISOString()
+                state.list = res.data.list;
-                    .replace(/T/g, ' ')
+                for(let i=0;i<state.list.length;i++)
-                    .replace(/\.[\d]{3}Z/, '')
+                {
-                  console.log(element.ORDERDATE)
+                  var dates = new Date(state.list[i].ORDERDATE).toJSON();
+                  state.list[i].ORDERDATE=new Date(+new Date(dates) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '')
+                  console.log( state.list[i].ORDERDATE);
                 }
+                state.page.total = res.data.total;
+                state.loading = false
                 state.active_row = state.list[0]
                 if (state.active_row) {
                   handleQuery_d()

src/views/Query/StockQuery/UnDoInfo/index.vue

@@ -189,11 +189,7 @@ function handleQueryInfo() {
 }
 function handleQuery() {
     state.list_d = []
-    state.list = []
-    state.page.total = 0;
     state.loading = true
-    state.page_d.total = 0;
-    state.loading_d = false
     queryFormRef.value.validate((isValid: boolean) => {
         if (isValid) {
             getQueryPageList({
@@ -206,10 +202,17 @@ function handleQuery() {
                 pageNum: state.page.pageNum,
                 pageSize: state.page.pageSize,
             }).then((res: any) => {
-              state.list = res.data.list;
+              if(res.data.list.length == 0){
-              state.page.total = res.data.total;
+                ElMessageBox.alert('查无数据', '提醒框', {
-              state.loading = false
+                  confirmButtonText: 'OK',
-              if (state.list.length > 0) {
+                })
+                state.loading = false
+                  state.list = []
+                  state.list_d = []
+              } else {
+                state.list = res.data.list;
+                state.page.total = res.data.total;
+                state.loading = false
                 state.active_row = state.list[0]
                 if (state.active_row) {
                   handleQuery_d()

src/views/label/modifyRemark/index.vue

@@ -505,19 +505,17 @@ const handleQuery = () => {
 function getStorageSpec() {
   state.queryParams.params.LOCATIONNAME = ''
   state.AllLocationList = []
-  if(state.queryParams.params.ERPLOCATION) {
+  getQueryList({
-    getQueryList({
+    queryId: 'GetLocationList',
-      queryId: 'GetLocationList',
+    version: 'WEB00001',
-      version: 'WEB00001',
+    params: {
-      params: {
+      SITENAME: 'SDK',
-        SITENAME: 'SDK',
+      ERPLOCATION: state.queryParams.params.ERPLOCATION //PO
-        ERPLOCATION: state.queryParams.params.ERPLOCATION //PO
+    } as any
-      } as any
+  }).then((res: any) => {
-    }).then((res: any) => {
+    state.AllLocationList = res.data
-      state.AllLocationList = res.data
+    locatioNFilter('')
-      locatioNFilter('')
+  })
-    })
-  }
 }
 
 function getGetPrintLabelType() {
@@ -549,23 +547,21 @@ function locatioNFilter(query: any) {
 function getERPLocation() {
   state.queryParams.params.LOCATIONNAME = ''
   state.queryParams.params.ERPLOCATION = ''
-  if (state.queryParams.params.ERPFACTORY) {
+  getQueryList({
-    getQueryList({
+    // queryId: "GetERPLocationForCreatePO",
-      // queryId: "GetERPLocationForCreatePO",
+    queryId: 'GetErpLocationList',
-      queryId: 'GetErpLocationList',
+    version: 'WEB00001',
-      version: 'WEB00001',
+    params: {
-      params: {
+      SITENAME: 'SDK',
-        SITENAME: 'SDK',
+      ERPFACTORYNAME: state.queryParams.params.ERPFACTORY
-        ERPFACTORYNAME: state.queryParams.params.ERPFACTORY
+    } as any
-      } as any
+  }).then((res: any) => {
-    }).then((res: any) => {
+    console.log(res.data)
-      console.log(res.data)
+    state.ERPLocationList = res.data
-      state.ERPLocationList = res.data
+    state.ERPLocationList.unshift({
-      state.ERPLocationList.unshift({
+      VALUE: '全部'
-        VALUE: '全部'
-      })
     })
-  }
+  })
 }
 
 function ERPFactoryQuery() {
@@ -615,9 +611,9 @@ function commitDESC_CN() {
           .then((res: any) => {
             console.log(res.success)
             if (res.success) {
-              ElMessageBox.alert('修改实际规格成功', '提醒框', {
+              // ElMessageBox.alert('修改实际规格成功', '提醒框', {
-                confirmButtonText: 'OK',
+              //   confirmButtonText: 'OK',
-              })
+              // })
             } else {
               ElMessageBox.alert(res.message, '提醒框', {
                 confirmButtonText: 'OK'