|
@@ -171,7 +171,8 @@
|
|
|
@click="sendGoods(row, 'add')"
|
|
@click="sendGoods(row, 'add')"
|
|
|
v-if="
|
|
v-if="
|
|
|
row.approvalStatus == 2 &&
|
|
row.approvalStatus == 2 &&
|
|
|
- (row.sendStatus == 0 || !row.sendStatus)
|
|
|
|
|
|
|
+ (row.sendStatus == 0 || !row.sendStatus) &&
|
|
|
|
|
+ isOurSourcMethod
|
|
|
"
|
|
"
|
|
|
>
|
|
>
|
|
|
发货
|
|
发货
|
|
@@ -181,7 +182,9 @@
|
|
|
type="primary"
|
|
type="primary"
|
|
|
:underline="false"
|
|
:underline="false"
|
|
|
@click="receivingGoods(row, 'receiving')"
|
|
@click="receivingGoods(row, 'receiving')"
|
|
|
- v-if="row.approvalStatus == 2 && row.sendStatus == 1"
|
|
|
|
|
|
|
+ v-if="
|
|
|
|
|
+ row.approvalStatus == 2 && row.sendStatus == 1 && isOurSourcMethod
|
|
|
|
|
+ "
|
|
|
>
|
|
>
|
|
|
收货
|
|
收货
|
|
|
</el-link>
|
|
</el-link>
|
|
@@ -208,6 +211,7 @@
|
|
|
import timeDialog from './components/timeDialog.vue';
|
|
import timeDialog from './components/timeDialog.vue';
|
|
|
import { getFile } from '@/api/system/file';
|
|
import { getFile } from '@/api/system/file';
|
|
|
import goodsDetail from './components/goodsDetail.vue';
|
|
import goodsDetail from './components/goodsDetail.vue';
|
|
|
|
|
+ import { parameterGetByCode } from '@/api/system/dictionary-data';
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
components: {
|
|
components: {
|
|
@@ -221,7 +225,8 @@
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
|
loading: false,
|
|
loading: false,
|
|
|
- tableHeight: 'calc(100vh - 300px)'
|
|
|
|
|
|
|
+ tableHeight: 'calc(100vh - 300px)',
|
|
|
|
|
+ isOurSourcMethod: false
|
|
|
};
|
|
};
|
|
|
},
|
|
},
|
|
|
filters: {
|
|
filters: {
|
|
@@ -458,9 +463,19 @@
|
|
|
return this.$store.state.user.info.clientEnvironmentId;
|
|
return this.$store.state.user.info.clientEnvironmentId;
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
- created() {},
|
|
|
|
|
|
|
+ created() {
|
|
|
|
|
+ this.getOutSourceMethods();
|
|
|
|
|
+ },
|
|
|
|
|
|
|
|
methods: {
|
|
methods: {
|
|
|
|
|
+ async getOutSourceMethods() {
|
|
|
|
|
+ await parameterGetByCode({
|
|
|
|
|
+ code: 'mes_outsourcing_method'
|
|
|
|
|
+ }).then((res) => {
|
|
|
|
|
+ this.isOurSourcMethod = res.value == '1' ? false : true;
|
|
|
|
|
+ });
|
|
|
|
|
+ },
|
|
|
|
|
+
|
|
|
statusFormatter(status) {
|
|
statusFormatter(status) {
|
|
|
const obj = this.statusOpt.find((i) => i.value == status);
|
|
const obj = this.statusOpt.find((i) => i.value == status);
|
|
|
return obj && obj.label;
|
|
return obj && obj.label;
|