From f443b27dd9dcf5af1339439689531536e85836c7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 12 三月 2024 15:55:48 +0800
Subject: [PATCH] 合并冲突
---
src/views/plan/customerorder/technology-form.vue | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 119 insertions(+), 0 deletions(-)
diff --git a/src/views/plan/customerorder/technology-form.vue b/src/views/plan/customerorder/technology-form.vue
new file mode 100644
index 0000000..e86e8d5
--- /dev/null
+++ b/src/views/plan/customerorder/technology-form.vue
@@ -0,0 +1,119 @@
+<template>
+ <el-dialog
+ top="10vh"
+ width="80%"
+ title="缂栧啓鎶�鏈氦搴曞崟"
+ :close-on-click-modal="false"
+ :visible.sync="visible"
+ v-if="visible"
+ >
+ <el-form :model="dataForm" :rules="dataRule" ref="dataForm" class="l-mes">
+ <el-form-item label="">
+ <!-- <el-date-picker
+ v-model="dataForm.selectTime"
+ type="datetime"
+ placeholder="閫夋嫨鏃ユ湡鏃堕棿"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ >
+ </el-date-picker> -->
+ <rich-text
+ editorId="fwb001122"
+ :richContent="remark"
+ @contentChange="contentChange"
+ ></rich-text>
+ </el-form-item>
+ </el-form>
+
+ <div slot="footer" class="dialog-footer">
+ <el-button type="info" @click="visible = false">鍙栨秷</el-button>
+ <el-button
+ type="primary"
+ :disabled="isSubmit"
+ v-thinclick="`dataFormSubmit`"
+ >纭畾</el-button
+ >
+ </div>
+ </el-dialog>
+ </template>
+
+ <script>
+ import { otcCustomerOrderSync } from '@/api/plan/customerorder'
+ import RichText from '@/views/common/rich-text.vue'
+
+ export default {
+ components: { RichText },
+ data() {
+ return {
+ visible: false,
+ dataForm: {
+ selectTime: null
+ },
+ dataRule: {},
+ isSubmit: false,
+ remark:''
+ }
+ },
+ methods: {
+ init() {
+ this.visible = true
+ },
+ dataFormSubmit() {
+ this.isSubmit = true
+ if (this.dataForm.selectTime != null && this.dataForm.selectTime != '') {
+ otcCustomerOrderSync({
+ selectTime: this.dataForm.selectTime,
+ pathCode: '0'
+ })
+ .then((response) => {
+ const resData = response.data
+ if (resData.code === 0) {
+ this.$message.success('鎷夊彇閿�鍞鍗曟垚鍔燂紱' + resData.msg)
+ this.visible = false
+ this.isSubmit = false
+ this.dataForm.selectTime = null
+ this.$emit('refreshDataList')
+ } else {
+ this.$message.success('鎷夊彇閿�鍞鍗曞け璐�')
+ this.isSubmit = false
+ }
+ })
+ .catch((error) => {
+ this.isSubmit = false
+ console.error(error)
+ })
+ } else {
+ this.isSubmit = false
+ this.$message.error('璇峰厛閫夋嫨鏃ユ湡')
+ }
+ },
+ contentChange(e){
+ console.log(1111,e)
+ }
+ }
+ }
+ </script>
+ <style scoped lang="scss">
+ .mps-table .el-table__row > td {
+ border: none;
+ }
+
+ .mps-table::before {
+ height: 0px;
+ }
+ /*
+ 瀛楃涓茶繃闀挎椂锛岄殣钘忔樉绀虹渷鐣ュ彿
+ */
+ .inline-el-hidden {
+ display: block;
+ width: 93%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ margin: 0 auto;
+ }
+ ::v-deep .quill-editor{
+ .ql-container{
+ min-height: 400px!important;
+ }
+ }
+ </style>
--
Gitblit v1.9.3