From 9ffd3537020d8ed17bcb446c2e9d62eccc6ec5bf Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 15 十一月 2023 17:54:33 +0800
Subject: [PATCH] xiufu
---
src/views/plan/masterproductionschedule/index.vue | 24 ++++++++++++------------
vue.config.js | 2 +-
src/views/plan/customerorder/index.vue | 10 +++++-----
src/views/plan/masterproductionschedule/auto-manufacturingorder.vue | 5 +++--
src/styles/variables.scss | 2 +-
5 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 8dfd822..96197cc 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -2,7 +2,7 @@
$mainBg: #409eff;
/* 鏀瑰彉涓婚鑹插彉閲� */
-$--color-primary: #006eff;
+$--color-primary: #875a7b;
/* 鏀瑰彉 icon 瀛椾綋璺緞鍙橀噺锛屽繀闇� */
$--font-path: '~element-ui/lib/theme-chalk/fonts';
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index d73a898..8ac6bbd 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -84,13 +84,13 @@
@click="()=>exportDialogVisible=true"
>瀵煎嚭鍙拌处</el-button
>
- <el-button
+ <!-- <el-button
v-if="permissions.plan_customerorder_return"
style="margin-left:10px;"
type="primary"
@click="returnOrder"
>璁㈠崟閫�鍥�</el-button
- >
+ > -->
</template>
</ttable>
@@ -449,7 +449,7 @@
{
minWidth: '100',
width: '100px',
- prop: 'contractNo',
+ prop: 'customerOrderNo',
label: '鍚堝悓缂栧彿',
sort: true,
isTrue: true,
@@ -1188,13 +1188,13 @@
},
// 浣滃簾
cancelHandle(row) {
- this.$confirm('纭浣滃簾閿�鍞鍗曞彿涓恒��' + row.contractNo + '銆戠殑鏁版嵁?','鎻愮ず' , {
+ this.$confirm('纭浣滃簾id涓恒��' + row.id + '銆戠殑鏁版嵁?','鎻愮ず' , {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
closeOnClickModal: false,
type: 'warning'
}).then(() => {
- dropByContractNo({contractNo:row.contractNo}).then((res) => {
+ dropByContractNo({id:row.id}).then((res) => {
if (res.data.code === 0) {
this.$message.success('浣滃簾鎴愬姛')
this.getData()
diff --git a/src/views/plan/masterproductionschedule/auto-manufacturingorder.vue b/src/views/plan/masterproductionschedule/auto-manufacturingorder.vue
index fab06e0..76551ef 100644
--- a/src/views/plan/masterproductionschedule/auto-manufacturingorder.vue
+++ b/src/views/plan/masterproductionschedule/auto-manufacturingorder.vue
@@ -155,7 +155,7 @@
</el-select>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
prop="isReportOperation"
label="IFS杞﹂棿璁㈠崟鎺ユ敹鏃舵姤鍛婂伐搴�"
align="center"
@@ -163,7 +163,7 @@
<template slot-scope="scope">
<span>{{ scope.row.isReportOperation ? '鏄�' : '鍚�' }}</span>
</template>
- </el-table-column>
+ </el-table-column> -->
</el-table>
</div>
</div>
@@ -417,6 +417,7 @@
},
getWorkShopOptions() {
remote('work_shop').then((response) => {
+ console.log("楂樺帇",response);
if (response.data.code === 0) {
this.workShopOptions = response.data.data
} else {
diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index 6229039..aeb9cf5 100644
--- a/src/views/plan/masterproductionschedule/index.vue
+++ b/src/views/plan/masterproductionschedule/index.vue
@@ -82,14 +82,14 @@
>
</el-dropdown-menu>
</el-dropdown>
- <el-button
+ <!-- <el-button
v-if="permissions.masterproductionschedule_submit_oa"
@click="commitOa()"
type="primary"
style="margin-left:10px;"
:loading="loadingOa"
>鎻愪氦OA
- </el-button>
+ </el-button> -->
<!-- <el-button
v-if="permissions.masterproductionschedule_sync_scm"
@click="syncScm()"
@@ -690,18 +690,18 @@
})
}
if (this.permissions.masterproductionschedule_create_outsourcing) {
- this.table.toolbar.push({
- text: '鍒涘缓濮斿璁㈠崟',
- fun: this.createOutsourcingOrder
- })
+ // this.table.toolbar.push({
+ // text: '鍒涘缓濮斿璁㈠崟',
+ // fun: this.createOutsourcingOrder
+ // })
}
if (this.permissions.masterproductionschedule_create_order_manual) {
- this.orderTypeArr.push({
- label: '鎵嬪姩鏂板',
- command: 'MANUAL',
- disabled: false,
- permitArr: ['02processed']
- })
+ // this.orderTypeArr.push({
+ // label: '鎵嬪姩鏂板',
+ // command: 'MANUAL',
+ // disabled: false,
+ // permitArr: ['02processed']
+ // })
}
if (this.permissions.masterproductionschedule_create_order_auto) {
this.orderTypeArr.push({
diff --git a/vue.config.js b/vue.config.js
index 866bbb4..b633662 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,7 +4,7 @@
*/
// const url = 'http://192.168.0.23:9999'
- const url = 'http://192.168.0.23:9999'
+ const url = 'http://localhost:9999'
// const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'
--
Gitblit v1.9.3