diff --git a/src/views/inout/InvoiceRegByFp.vue b/src/views/inout/InvoiceRegByFp.vue
index a5704a9b..635b07ce 100644
--- a/src/views/inout/InvoiceRegByFp.vue
+++ b/src/views/inout/InvoiceRegByFp.vue
@@ -526,7 +526,7 @@
prop="certCode"
show-overflow-tooltip
></el-table-column> -->
- <template v-for="(item, index) in tableHeader3">
+ <template v-for="(item, index) in tableHeader3">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
diff --git a/src/views/inout/InvoiceRegByOrder.vue b/src/views/inout/InvoiceRegByOrder.vue
index 4e219ccc..8580a881 100644
--- a/src/views/inout/InvoiceRegByOrder.vue
+++ b/src/views/inout/InvoiceRegByOrder.vue
@@ -1189,7 +1189,7 @@ export default {
this.Upinvoice = false;
this.getBizDetailListInv();
},
- printOrder(_this,row) {
+ printOrder(D,row) {
_this.currentManufacturer = row;
_this.Upinvoice = true;
},
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index 28674c80..eb2c86b7 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -451,22 +451,23 @@
></el-date-picker>
</el-form-item>
</template>
+ <el-form-item>
+ <el-button-group>
+ <el-button
+ type="primary"
+ icon="el-icon-refresh"
+ @click="onBizReset"
+ >重置
+ </el-button>
+ <el-button type="primary" @click="onBizSubmit"
+ icon="el-icon-search"
+ >查询
+ </el-button>
+ </el-button-group>
+ </el-form-item>
</el-row>
- <el-form-item>
- <el-button-group>
- <el-button
- type="primary"
- icon="el-icon-refresh"
- @click="onBizReset"
- >重置
- </el-button>
- <el-button type="primary" @click="onBizSubmit"
- icon="el-icon-search"
- >查询
- </el-button>
- </el-button-group>
- </el-form-item>
+
</el-form>
<el-table v-loading="bizDetailLoading" :data="codeDetailList" style="width: 100%" border
@@ -733,22 +734,23 @@
></el-date-picker>
</el-form-item>
</template>
+ <el-form-item>
+ <el-button-group>
+ <el-button
+ type="primary"
+ icon="el-icon-refresh"
+ @click="onResultReset"
+ >重置
+ </el-button>
+ <el-button type="primary" @click="onResultSubmit"
+ icon="el-icon-search"
+ >查询
+ </el-button
+ >
+ </el-button-group>
+ </el-form-item>
</el-row>
- <el-form-item>
- <el-button-group>
- <el-button
- type="primary"
- icon="el-icon-refresh"
- @click="onResultReset"
- >重置
- </el-button>
- <el-button type="primary" @click="onResultSubmit"
- icon="el-icon-search"
- >查询
- </el-button
- >
- </el-button-group>
- </el-form-item>
+
</el-form>
<el-table v-loading="resultDetailLoading" :data="resultDetailList" style="width: 100%" border
@@ -1026,6 +1028,7 @@ export default {
options: {
getInvList:[],
getDeptList:[],
+ getBusType:[],
},
loading: false,
index: null,
diff --git a/src/views/inout/IoCheckErrorOrder.vue b/src/views/inout/IoCheckErrorOrder.vue
index 1f37474c..e8f1c556 100644
--- a/src/views/inout/IoCheckErrorOrder.vue
+++ b/src/views/inout/IoCheckErrorOrder.vue
@@ -408,22 +408,23 @@
></el-date-picker>
</el-form-item>
</template>
+ <el-form-item>
+ <el-button-group>
+ <el-button
+ type="primary"
+ icon="el-icon-refresh"
+ @click="onBizReset"
+ >重置
+ </el-button>
+ <el-button type="primary" @click="onBizSubmit"
+ icon="el-icon-search"
+ >查询
+ </el-button>
+ </el-button-group>
+ </el-form-item>
</el-row>
- <el-form-item>
- <el-button-group>
- <el-button
- type="primary"
- icon="el-icon-refresh"
- @click="onBizReset"
- >重置
- </el-button>
- <el-button type="primary" @click="onBizSubmit"
- icon="el-icon-search"
- >查询
- </el-button>
- </el-button-group>
- </el-form-item>
+
</el-form>
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border
@@ -655,21 +656,22 @@
></el-date-picker>
</el-form-item>
</template>
+ <el-form-item>
+ <el-button-group>
+ <el-button
+ type="primary"
+ icon="el-icon-refresh"
+ @click="onCodeReset"
+ >重置
+ </el-button>
+ <el-button type="primary" @click="onCodeSubmit"
+ icon="el-icon-search"
+ >查询
+ </el-button>
+ </el-button-group>
+ </el-form-item>
</el-row>
- <el-form-item>
- <el-button-group>
- <el-button
- type="primary"
- icon="el-icon-refresh"
- @click="onCodeReset"
- >重置
- </el-button>
- <el-button type="primary" @click="onCodeSubmit"
- icon="el-icon-search"
- >查询
- </el-button>
- </el-button-group>
- </el-form-item>
+
</el-form>
<el-table v-loading="codeDetailLoading" :data="codeDetailList" style="width: 100%" border
@@ -904,22 +906,23 @@
></el-date-picker>
</el-form-item>
</template>
+ <el-form-item>
+ <el-button-group>
+ <el-button
+ type="primary"
+ icon="el-icon-refresh"
+ @click="onResultReset"
+ >重置
+ </el-button>
+ <el-button type="primary" @click="onResultSubmit"
+ icon="el-icon-search"
+ >查询
+ </el-button
+ >
+ </el-button-group>
+ </el-form-item>
</el-row>
- <el-form-item>
- <el-button-group>
- <el-button
- type="primary"
- icon="el-icon-refresh"
- @click="onResultReset"
- >重置
- </el-button>
- <el-button type="primary" @click="onResultSubmit"
- icon="el-icon-search"
- >查询
- </el-button
- >
- </el-button-group>
- </el-form-item>
+
</el-form>
<el-table v-loading="resultDetailLoading" :data="resultDetailList" style="width: 100%" border
@@ -1157,6 +1160,7 @@ export default {
options: {
getSubInvList:[],
getDeptList:[],
+ getBusType:[],
},
loading: false,
index: null,
@@ -1435,6 +1439,7 @@ export default {
})
.catch(() => {
});
+ _this.getBusType(_this);
},
getSubInvList(_this) {
let query = {
@@ -1449,7 +1454,7 @@ export default {
});
},
subInvChange() {
- this.getBusType();
+ this.getBusType(this);
},
checkOrder(orderId) {
},
diff --git a/src/views/inout/IoCheckSuccessOrder.vue b/src/views/inout/IoCheckSuccessOrder.vue
index a923dd9d..6ec8fc46 100644
--- a/src/views/inout/IoCheckSuccessOrder.vue
+++ b/src/views/inout/IoCheckSuccessOrder.vue
@@ -405,22 +405,24 @@
></el-date-picker>
</el-form-item>
</template>
+
+ <el-form-item>
+ <el-button-group>
+ <el-button
+ type="primary"
+ icon="el-icon-refresh"
+ @click="onBizReset"
+ >重置
+ </el-button>
+ <el-button type="primary" @click="onBizSubmit"
+ icon="el-icon-search"
+ >查询
+ </el-button>
+ </el-button-group>
+ </el-form-item>
</el-row>
- <el-form-item>
- <el-button-group>
- <el-button
- type="primary"
- icon="el-icon-refresh"
- @click="onBizReset"
- >重置
- </el-button>
- <el-button type="primary" @click="onBizSubmit"
- icon="el-icon-search"
- >查询
- </el-button>
- </el-button-group>
- </el-form-item>
+
</el-form>
<el-table v-loading="bizDetailLoading" :data="bizDetailList" style="width: 100%" border class="table-fixed"
@@ -688,22 +690,24 @@
></el-date-picker>
</el-form-item>
</template>
+
+ <el-form-item>
+ <el-button-group>
+ <el-button
+ type="primary"
+ icon="el-icon-refresh"
+ @click="onResultReset"
+ >重置
+ </el-button>
+ <el-button type="primary" @click="onResultSubmit"
+ icon="el-icon-search"
+ >查询
+ </el-button
+ >
+ </el-button-group>
+ </el-form-item>
</el-row>
- <el-form-item>
- <el-button-group>
- <el-button
- type="primary"
- icon="el-icon-refresh"
- @click="onResultReset"
- >重置
- </el-button>
- <el-button type="primary" @click="onResultSubmit"
- icon="el-icon-search"
- >查询
- </el-button
- >
- </el-button-group>
- </el-form-item>
+
</el-form>
<el-table v-loading="resultDetailLoading" :data="resultDetailList" style="width: 100%" border
@@ -973,6 +977,7 @@ export default {
options: {
getInvList:[],
getDeptList:[],
+ getBusType:[],
},
loading: false,
index: null,
diff --git a/src/views/inout/IoCreateBusOrder.vue b/src/views/inout/IoCreateBusOrder.vue
index 0d38670c..4d4b8c38 100644
--- a/src/views/inout/IoCreateBusOrder.vue
+++ b/src/views/inout/IoCreateBusOrder.vue
@@ -462,6 +462,7 @@ export default {
options: {
getInvList:[],
getDeptList:[],
+ getBusType:[],
},
loading: false,
index: null,
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 01a3a4d1..7a227b71 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -469,6 +469,7 @@ export default {
options: {
getInvList:[],
getDeptList:[],
+ getBusType:[],
},
loading: false,
index: null,
diff --git a/src/views/inout/IoCreateScanOrder.vue b/src/views/inout/IoCreateScanOrder.vue
index 0eda97bd..1f79e2b8 100644
--- a/src/views/inout/IoCreateScanOrder.vue
+++ b/src/views/inout/IoCreateScanOrder.vue
@@ -462,6 +462,7 @@ export default {
options: {
getInvList:[],
getDeptList:[],
+ getBusType:[],
},
loading: false,
index: null,
diff --git a/src/views/inout/IoDealOrder.vue b/src/views/inout/IoDealOrder.vue
index 6f268bb9..c093f51b 100644
--- a/src/views/inout/IoDealOrder.vue
+++ b/src/views/inout/IoDealOrder.vue
@@ -565,6 +565,7 @@ export default {
options: {
getInvList:[],
getDeptList:[],
+ getBusType:[],
},
loading: false,
index: null,