From eadcab6a72d883a557631114b85bc19dfdbc6286 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 20 十月 2023 11:31:25 +0800
Subject: [PATCH] modified: src/api/basic/part.js modified: src/views/basic/part/index.vue modified: src/views/basic/part/part-form.vue modified: src/views/plan/customerorder/index.vue
---
src/views/basic/part/index.vue | 83 +++++++++++++++++++++++++++++++++--------
src/views/plan/customerorder/index.vue | 11 ++---
src/api/basic/part.js | 2
src/views/basic/part/part-form.vue | 8 ++--
4 files changed, 77 insertions(+), 27 deletions(-)
diff --git a/src/api/basic/part.js b/src/api/basic/part.js
index 28c6263..9426c2a 100644
--- a/src/api/basic/part.js
+++ b/src/api/basic/part.js
@@ -121,7 +121,7 @@
export function syncPart(query) {
return request({
url: '/mes/part/syncPart',
- method: 'post',
+ method: 'get',
params: query
})
}
diff --git a/src/views/basic/part/index.vue b/src/views/basic/part/index.vue
index 0727e12..e677457 100644
--- a/src/views/basic/part/index.vue
+++ b/src/views/basic/part/index.vue
@@ -25,11 +25,36 @@
:printLabelInfo="printLabelInfo"
/>
</basic-container>
+ <el-dialog title="閫夋嫨鍚屾鏃ユ湡" :visible.sync="syncDateVisible" width="21%">
+ <div style="display: flex;justify-content: center">
+ <el-form
+ :model="dataForm"
+ :inline="true"
+ :rules="dataRule"
+ ref="dataForm"
+ class="l-mes"
+ >
+ <el-form-item label="鏃ユ湡" prop="selectTime">
+ <el-date-picker
+ v-model="dataForm.selectTime"
+ type="datetime"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-form>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="syncDateVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="syncIfs">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
<script>
-import { fetchList, delObj, syncIfs, syncPart } from '@/api/basic/part'
+import { fetchList, delObj, syncPart } from '@/api/basic/part'
import TableForm from './part-form'
import { mapGetters } from 'vuex'
import ttable from '@/views/common/ztt-table.vue'
@@ -40,6 +65,15 @@
export default {
data() {
return {
+ dataRule: {
+ selectTime: [
+ { required: true, message: '鍚屾鏃ユ湡涓嶈兘涓虹┖', trigger: 'change' }
+ ]
+ },
+ dataForm: {
+ selectTime: null
+ },
+ syncDateVisible: false,
ajaxFun: fetchList,
addOrUpdateVisible: false,
multipleSelection: [],
@@ -363,11 +397,11 @@
fun: this.addOrUpdateHandle
},
{
- text: '鍚屾ERP',
+ text: '鍚屾MDM',
type: 'primary',
- fun: this.syncIfs,
+ fun: () => (this.syncDateVisible = true),
loading: false
- },
+ }
// {
// text: '澶ф爣绛�',
// type: 'primary',
@@ -628,18 +662,28 @@
// }
// },
syncIfs() {
- syncPart({})
- .then((res) => {
- const data = res.data
- if (data.code === 0) {
- this.$message.success('寮�濮嬪悓姝�')
- } else {
- this.$message.error('鍚屾ERP澶辫触')
- }
- })
- .catch((e) => {
- // this.$message.error('鍚屾ERP澶辫触:' + e)
- })
+ this.$refs.dataForm.validate((valid) => {
+ if (valid) {
+ this.syncDateVisible = false
+ this.table.toolbar.find((e) => e.text === '鍚屾MDM').loading = true
+ syncPart({ updateTime: this.dataForm.selectTime })
+ .then((res) => {
+ const data = res.data
+ if (data.code === 0) {
+ this.$message.success(data.msg)
+ } else {
+ this.$message.error('鍚屾MDM澶辫触')
+ }
+ this.getData()
+ this.table.toolbar.find(
+ (e) => e.text === '鍚屾MDM'
+ ).loading = false
+ })
+ .catch((e) => {
+ this.$message.error('鍚屾MDM澶辫触:' + e)
+ })
+ }
+ })
},
printLabel() {
if (this.multipleSelection && this.multipleSelection.length > 0) {
@@ -677,6 +721,13 @@
this.$message.error('璇烽�夋嫨闆朵欢')
}
}
+ },
+ watch: {
+ syncDateVisible(newVal) {
+ if (!newVal) {
+ this.$refs.dataForm.resetFields()
+ }
+ }
}
}
</script>
diff --git a/src/views/basic/part/part-form.vue b/src/views/basic/part/part-form.vue
index 9a088f2..be71876 100644
--- a/src/views/basic/part/part-form.vue
+++ b/src/views/basic/part/part-form.vue
@@ -20,12 +20,12 @@
placeholder="闆朵欢鍙�"
:disabled="(dataForm.id != null && dataForm.id > 0) || status"
>
- <el-button
+ <!-- <el-button
slot="append"
icon="el-icon-search"
@click="openPartDialog()"
v-show="!dataForm.id"
- ></el-button>
+ ></el-button> -->
</el-input>
</el-form-item>
</el-col>
@@ -36,11 +36,11 @@
placeholder="闆朵欢鍚嶇О"
:disabled="status"
>
- <el-button
+ <!-- <el-button
slot="append"
icon="el-icon-search"
@click="openPartDialog()"
- ></el-button>
+ ></el-button> -->
</el-input>
</el-form-item>
</el-col>
diff --git a/src/views/plan/customerorder/index.vue b/src/views/plan/customerorder/index.vue
index dbee1f0..cf9d74d 100644
--- a/src/views/plan/customerorder/index.vue
+++ b/src/views/plan/customerorder/index.vue
@@ -40,8 +40,7 @@
<el-dropdown-item
:command="item.command"
v-for="item in documentTagArr"
- :disabled="item.disabled"
- >
+ :disabled="item.disabled">
{{ item.label }}
</el-dropdown-item>
</el-dropdown-menu>
@@ -835,9 +834,9 @@
...mapGetters(['permissions'])
},
watch: {
- exportDialogVisible(newVal){
- if(!newVal){
- this.$refs['exportForm'].resetFields()
+ exportDialogVisible(newVal) {
+ if (!newVal) {
+ this.$refs.exportForm.resetFields()
}
},
coState: {
@@ -954,7 +953,7 @@
queryParam.push(
Object.assign({
prop: 'coState',
- searchInfoType: 'select',
+ searchInfoType: 'select'
// propVal: '01partUnCheck'
// propVal: '02technologyUnCheck'
})
--
Gitblit v1.9.3