Browse Source

feat(售后申请单、售后退货单)审核这备注字段修改

snow 2 years ago
parent
commit
92f86dbcf5

+ 3 - 0
src/components/globalComponents/exam-form/main.vue

@@ -79,6 +79,8 @@
 </template>
 
 <script>
+import { replaceTextWrapAndSpace } from '@/utils'
+
 export default {
   name: 'ExamForm',
   props: ['size', 'statusList', 'disabled', 'isMust', 'labelWidth'],
@@ -187,6 +189,7 @@ export default {
     async submitForm() {
       await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
+          this.ruleForm.remark = replaceTextWrapAndSpace(this.ruleForm.remark)
           this.$emit('searchChange', this.ruleForm)
         } else {
           console.log('error submit!!')

+ 0 - 1
src/main.js

@@ -14,7 +14,6 @@ import 'element-ui/lib/theme-chalk/display.css'
 import './styles/element-variables.scss'
 
 import FlowChart from '@/components/flow-chart'
-
 import './styles/index.scss' // global css
 import globalComponents from './components/globalComponents'
 import App from './App'

+ 4 - 1
src/views/sellOut/returnOrder/components/return-record.vue

@@ -109,6 +109,7 @@
             </el-form>
           </el-form-item>
         </el-col>
+
         <el-col
           :span="24"
           style="text-align: right; margin: -5px 0 20px 0"
@@ -134,6 +135,7 @@ import asyncRequest from "@/apis/service/sellOut/returnOrder";
 import resToken from "@/mixins/resToken";
 import { isnumber } from "@/utils/validate";
 import abnormalConditionModal from "@/components/abnormal-condition-modal";
+import { replaceTextWrapAndSpace } from "@/utils"
 export default {
   name: "zxAfterSaleOrderDetail",
   props: ["id", "showModelThis", "newTime", "sitem"],
@@ -275,8 +277,9 @@ export default {
           if (this.loading) {
             return;
           }
-          this.loading = true;
 
+          this.ruleForm.remark = replaceTextWrapAndSpace(this.ruleForm.remark)
+          this.loading = true;
           let model = JSON.parse(JSON.stringify(this.ruleForm));
           let list = JSON.parse(JSON.stringify(this.arr));
           let { return_num, normal, product_go, remark } = model;

+ 3 - 3
src/views/sellOut/sellAfterApply/components/approval-results.vue

@@ -8,7 +8,7 @@
     </el-form-item>
 
     <el-form-item label="审核备注" prop="remark">
-      <el-input v-model="formData.remark" />
+      <el-input v-model="formData.remark" type="textarea" />
     </el-form-item>
 
     <template v-if="displayExpressField">
@@ -40,6 +40,7 @@
 </template>
 <script>
 import companyHelper from '@/mixins/companyHelper'
+import { replaceTextWrapAndSpace } from '@/utils'
 export default {
   name: 'ApprovalResults',
   mixins: [companyHelper],
@@ -115,13 +116,12 @@ export default {
     submit() {
       this.$refs.formRef.validate(isValid => {
         if (!isValid) return
+        this.formData.remark = replaceTextWrapAndSpace(this.formData.remark)
         const { wsm_code } = this.formData
-
         const params = {
           ...this.formData,
           wsm_code: Array.isArray(wsm_code) ? wsm_code[0] : wsm_code
         }
-
         this.$emit('changeStatus', params)
       })
     }

+ 4 - 1
src/views/sellOut/sellAfterApply/components/supplier-confirm.vue

@@ -6,7 +6,7 @@
       </el-select>
     </el-form-item>
     <el-form-item label="审核备注" prop="remark">
-      <el-input v-model="formData.remark" />
+      <el-input v-model="formData.remark" type="textarea" />
     </el-form-item>
 
     <template v-if="displayExpressField">
@@ -39,6 +39,7 @@
   </el-form>
 </template>
 <script>
+import { replaceTextWrapAndSpace } from '@/utils'
 import { isMobile } from '@/utils/validate'
 
 const validatename = (rule, value, callback) => {
@@ -146,6 +147,8 @@ export default {
           _status = '5'
         }
 
+        this.formData.remark = replaceTextWrapAndSpace(this.formData.remark)
+
         const params = {
           ...this.formData,
           status: _status,

+ 3 - 1
src/views/sellOut/sellAfterApply/components/supplier_exam.vue

@@ -6,7 +6,7 @@
       </el-select>
     </el-form-item>
     <el-form-item label="审核备注" prop="remark">
-      <el-input v-model="formData.remark" />
+      <el-input v-model="formData.remark" type="textarea" />
     </el-form-item>
 
     <template v-if="displayExpressField">
@@ -39,6 +39,7 @@
   </el-form>
 </template>
 <script>
+import { replaceTextWrapAndSpace } from '@/utils'
 import { isMobile } from '@/utils/validate'
 
 const validatename = (rule, value, callback) => {
@@ -144,6 +145,7 @@ export default {
       this.$refs.formRef.validate(isValid => {
         if (!isValid) return
         const { addr_code } = this.formData
+        this.formData.remark = replaceTextWrapAndSpace(this.formData.remark)
 
         const params = {
           ...this.formData,