Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin into develop

src/views/auxiliaryFittings/home/index.vue

@@ -204,7 +204,7 @@
 			<div class="mode" >
 				<div class="title">辅材销售退货单统计</div>
 				<div class="flex head">
-					<div class="tab" @click="gotopage('auxiliarySalesReturnOrder','取消订单数量','CANCEL')">
+					<div class="tab" @click="gotopage('auxiliarySalesReturnOrder','已保存数量','SAVE')">
 						<div class="text">
 							<div class="num">{{collectData.saveSalesRetNum}}</div>
 							<div class="title">已保存数量</div>
@@ -374,7 +374,7 @@
 				</div>
 			</div>
 			<div class="mode" >
-				<div class="title">配件旧件返还单统计</div>
+				<div class="title">配件旧件返厂单统计</div>
 				<div class="flex head">
 					<div class="tab" @click="gotopage('oldPartsReturnFactory','已保存数量','SAVE')">
 						<div class="text">

src/views/auxiliaryFittings/salesManagement/attachmentNewReturn/index.vue

@@ -76,9 +76,9 @@ export default {
 		formItems() { }
 	},
 	created(){
-		if(this.pageCode){
-			this.orderEnginBaseId = this.pageCode
-		}
+    if (this.pageCode && !~['SAVE','SUBMIT','OK'].indexOf(this.pageCode)) {
+      this.orderEnginBaseId = this.pageCode
+    }
 	},
 	watch: {
 		flag(){

src/views/auxiliaryFittings/salesManagement/auxiliarySalesOrder/index.vue

@@ -138,9 +138,9 @@ export default {
 			this.formDialogType = 2
 			this.openForm()
 		}
-		if(this.pageCode){
-			this.orderEnginBaseId = this.pageCode
-		}
+    if (this.pageCode && !~['SAVE','SUBMIT','PAY_NOT_TAKE','PAY_TAKE','CANCEL'].indexOf(this.pageCode)) {
+      this.orderEnginBaseId = this.pageCode
+    }
 	},
 	watch: {
 		flag(){

src/views/mallManagement/setActivity/index.vue

@@ -32,6 +32,7 @@ import answer from "./answer.vue"
 import ImageUpload from '@/components/file-upload'
 import quillEditor from '@/components/v-quill-editor'
 import editTable from "@/components/template/editTable.js"
+import { required, mobileRequired, mobile, httpUrl, email } from '@/components/template/rules_verify.js'
 export default {
   components: { TemplatePage, answer, ImageUpload, quillEditor },
   mixins: [import_mixin, operation_mixin, editTable],
@@ -215,7 +216,11 @@ export default {
         {
           name: 'slot-component',
           md: 24,
-          formItemAttributes: { label: '提交记录', prop: 'promotionQuestionnaireUsers' },
+          formItemAttributes: { 
+            label: '提交记录', 
+            prop: 'promotionQuestionnaireUsers',
+            rules: [{ required: true, message: '请设置', trigger: 'blur' }]
+          },
           render: (h, { props, onInput }) => {
             var { value } = props
             return this.convertTableJson(value, [
@@ -245,7 +250,7 @@ export default {
                 editRender: (h, { row, column, index }) => {
                   return (
                     <div class="redbordererr">
-                      <el-form-item label="" label-width="0px" prop={`promotionQuestionnaireUsers.${index}.${column.columnAttributes.prop}`} rules={[{ required: true, message: '请填写', trigger: 'blur' }]}>
+                      <el-form-item label="" label-width="0px" prop={`promotionQuestionnaireUsers.${index}.${column.columnAttributes.prop}`} rules={mobileRequired}>
                         <el-input value={row[column.columnAttributes.prop]} onInput={val => { row[column.columnAttributes.prop] = val }} placeholder="请输入内容"></el-input>
                       </el-form-item>
                     </div>
@@ -348,7 +353,7 @@ export default {
           label: '',
           'label-width': '0px',
           prop: 'promotionQuestionnaireItems',
-          rules: []
+          rules: [{ required: true, message: '请设置', trigger: 'blur' }]
         },
         render: (h, { props, onInput }) => {
           return (