diff --git a/src/views/inout/DialogEditCode.vue b/src/views/inout/DialogEditCode.vue
index c7cffc4f..4b68fe74 100644
--- a/src/views/inout/DialogEditCode.vue
+++ b/src/views/inout/DialogEditCode.vue
@@ -49,6 +49,7 @@
diff --git a/src/views/inout/IoCheckAuditOrder.vue b/src/views/inout/IoCheckAuditOrder.vue
index cdde8990..ab22e94b 100644
--- a/src/views/inout/IoCheckAuditOrder.vue
+++ b/src/views/inout/IoCheckAuditOrder.vue
@@ -655,7 +655,7 @@ export default {
newAcceptOrderVisible: false,
};
},
- components: {AcceptOrder, NewAcceptOrder,ElImageViewer},
+ components: {AcceptOrder, NewAcceptOrder, ElImageViewer},
methods: {
onReset() {
this.$router.push({
@@ -1004,7 +1004,7 @@ export default {
//单据撤回
rollback(row) {
- this.$confirm('此操作将撤回单据至待校验, 是否继续?', '提示', {
+ this.$confirm('此操作将撤回单据至已校验未审核状态, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
index ecb475cc..a5b1f3b7 100644
--- a/src/views/inventory/supInoutSearchOrder.vue
+++ b/src/views/inventory/supInoutSearchOrder.vue
@@ -90,8 +90,8 @@
-
-
+
+
diff --git a/src/views/purchase/company/companyProducts.vue b/src/views/purchase/company/companyProducts.vue
index 0c2bdbaf..cb94190a 100644
--- a/src/views/purchase/company/companyProducts.vue
+++ b/src/views/purchase/company/companyProducts.vue
@@ -436,7 +436,7 @@ export default {
};
this.checked = row.isUseDy == 1;
this.detailQuery = {
- cpmctymc: row.cpmctymc,
+ entireCpmctymc: row.cpmctymc,
manufactory: row.manufactory,
page: 1,
limit: 10,
diff --git a/src/views/system/device/phoneRegisterManage.vue b/src/views/system/device/phoneRegisterManage.vue
index e45b4826..64623ee5 100644
--- a/src/views/system/device/phoneRegisterManage.vue
+++ b/src/views/system/device/phoneRegisterManage.vue
@@ -47,7 +47,8 @@
size="small"
placeholder="请输入内容"
clearable
- v-model="companyInfo.name"
+ disabled="false"
+ v-model="locSystem"
>
@@ -242,6 +243,7 @@ export default {
qrCodeVisible: false,
serverUrl: false,
companyInfo: {},
+ locSystem: process.env.VUE_APP_TITLE,
};
},
@@ -259,11 +261,11 @@ export default {
},
onSubmit() {
- this.filterQuery.page=1;
+ this.filterQuery.page = 1;
this.getList();
},
- closeDialogVisible(){
- this.centerDialogVisible=false;
+ closeDialogVisible() {
+ this.centerDialogVisible = false;
this.getList();
},
getList() {