Browse Source

Merge branch 'dev' into pre-production

pre-production
pref_mail@163.com 5 months ago
parent
commit
8bde9e1046
  1. 4
      src/views/aftersales/aftersalesWorkOrder.vue
  2. 6
      src/views/distribution/inventory/delivery/Unstoreddetails.vue
  3. 3
      src/views/distribution/inventory/delivery/distributionStockArticle.vue

4
src/views/aftersales/aftersalesWorkOrder.vue

@ -98,13 +98,13 @@
<el-icon><Plus /></el-icon> </el-button <el-icon><Plus /></el-icon> </el-button
> >
<el-button <!-- <el-button
v-if="ButtonPermissions.export_Report" v-if="ButtonPermissions.export_Report"
type="primary" type="primary"
@click="exportReport" @click="exportReport"
> >
<el-icon><Download /></el-icon>EXCEL</el-button <el-icon><Download /></el-icon>EXCEL</el-button
> > -->
<el-button <el-button
v-if="ButtonPermissions.Timed_outexport" v-if="ButtonPermissions.Timed_outexport"

6
src/views/distribution/inventory/delivery/Unstoreddetails.vue

@ -82,8 +82,8 @@
</el-form> </el-form>
</div> </div>
<el-tabs type="border-card" class="el_tabs" @click="tabclaick" v-model="activeName"> <el-tabs type="border-card" class="el_tabs" @click="tabclaick" v-model="activeName">
<el-tab-pane label="已入库" name="1"></el-tab-pane>
<el-tab-pane label="未入库" name="2"></el-tab-pane> <el-tab-pane label="未入库" name="2"></el-tab-pane>
<el-tab-pane label="已入库" name="1"></el-tab-pane>
</el-tabs> </el-tabs>
<!-- 控件模块 --> <!-- 控件模块 -->
<el-row> <el-row>
@ -181,7 +181,7 @@ import {
const $router = useRouter(); // const $router = useRouter(); //
const $useStore = useStore(); // const $useStore = useStore(); //
const $route = useRoute(); // const $route = useRoute(); //
const activeName = ref('1'); const activeName = ref('2');
const dataCopy = ref([]); // const dataCopy = ref([]); //
const dialogVisible = ref(false); const dialogVisible = ref(false);
const from = ref({ const from = ref({
@ -401,7 +401,7 @@ const onLoad = async () => {
console.log(_res, '基础信息'); console.log(_res, '基础信息');
from.value.warehouse = data.warehouse; // from.value.warehouse = data.warehouse; //
from.value.unWarehouse = data.unWarehouse; // from.value.unWarehouse = data.unWarehouse; //
details.data = data.warehouse; details.data = data.unWarehouse;
dataCopy.value = deepClone(from.value.warehouse); dataCopy.value = deepClone(from.value.warehouse);
details.loadingObj.list = false; details.loadingObj.list = false;
}; };

3
src/views/distribution/inventory/delivery/distributionStockArticle.vue

@ -934,6 +934,9 @@ export default {
methods: { methods: {
// //
InformationViewing(row) { InformationViewing(row) {
if(!row.notReceived || Number(row.isZero)) {
return
}
this.$router.push({ this.$router.push({
path: '/distribution/inventory/delivery/Unstoreddetails', path: '/distribution/inventory/delivery/Unstoreddetails',
query: { query: {

Loading…
Cancel
Save