辅配件销售订单修改

src/api/auxiliaryFittings/auxiliarySalesOrder.js

@@ -18,8 +18,12 @@ export function pageExport(data, name) {
   })
 }
 
-export function listImport(data) {
-	return handleImport('/websit/sales/list/import', data.formdata, data.id || '')
+export function listImportM(data) {
+	return handleImport('/websit/sales/m/import', data.formdata, data.id || '')
+}
+
+export function listImportP(data) {
+	return handleImport('/websit/sales/p/import', data.formdata, data.id || '')
 }
 
 // 新增

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

@@ -30,7 +30,7 @@ import import_mixin from '@/components/template/import_mixin.js'
 import ImageUpload from '@/components/file-upload'
 import { downloadFiles } from '@/utils/util'
 import { required, mobileRequired, mobile, httpUrl, email } from '@/components/template/rules_verify.js'
-import { listPageV2, pageExport, getDetail, add, edit, submit, listImport } from "@/api/auxiliaryFittings/auxiliarySalesOrder";
+import { listPageV2, pageExport, getDetail, add, edit, submit, listImportP } from "@/api/auxiliaryFittings/auxiliarySalesOrder";
 import { getWebsit } from "@/api/customerManagement";
 import printPreview from '../components/preview.vue'
 import { disAutoConnect, hiprint } from 'vue-plugin-hiprint'
@@ -80,7 +80,7 @@ export default {
 					[
 						this.optionsEvensAuth("imp", {
 							render: () => {
-							  return this.importButton(listImport, '导入')
+							  return this.importButton(listImportP, '导入')
 							}
 						})
 					],
@@ -398,7 +398,7 @@ export default {
 		},
 		// 下载导入模版
 		handleDownload() {
-			commonTemplateDownload({ name: '师傅分销员资料初始化.xlsx' }, `${this.$route.meta.title}`).then(res => {
+			commonTemplateDownload({ name: '配件销售订单导入模板.xlsx' }, `${this.$route.meta.title}`).then(res => {
 			    this.$message({
 			        message: '下载成功',
 			        type: 'success'

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

@@ -30,7 +30,7 @@ import import_mixin from '@/components/template/import_mixin.js'
 import ImageUpload from '@/components/file-upload'
 import { downloadFiles } from '@/utils/util'
 import { required, mobileRequired, mobile, httpUrl, email } from '@/components/template/rules_verify.js'
-import { listPageV2, pageExport, getDetail, add, edit, submit, listImport } from "@/api/auxiliaryFittings/auxiliarySalesOrder";
+import { listPageV2, pageExport, getDetail, add, edit, submit, listImportM } from "@/api/auxiliaryFittings/auxiliarySalesOrder";
 import { getWebsit } from "@/api/customerManagement";
 import printPreview from '../components/preview.vue'
 import { disAutoConnect, hiprint } from 'vue-plugin-hiprint'
@@ -80,7 +80,7 @@ export default {
 					[
 						this.optionsEvensAuth("imp", {
 							render: () => {
-							  return this.importButton(listImport, '导入')
+							  return this.importButton(listImportM, '导入')
 							}
 						})
 					],
@@ -395,7 +395,7 @@ export default {
 		},
 		// 下载导入模版
 		handleDownload() {
-			commonTemplateDownload({ name: '师傅分销员资料初始化.xlsx' }, `${this.$route.meta.title}`).then(res => {
+			commonTemplateDownload({ name: '辅材销售订单导入模板.xlsx' }, `${this.$route.meta.title}`).then(res => {
 			    this.$message({
 			        message: '下载成功',
 			        type: 'success'

src/views/auxiliaryFittings/salesManagement/components/attachmentNewReturnDetail.vue

@@ -138,7 +138,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :span="24">
-								<el-form-item label="项目地址" prop="province" :required="true">
+								<el-form-item label="项目地址" :required="true">
 									<el-row>
 										<el-col :span="5" style="margin-right: 12px;">
 											<el-input type="text" v-model="formData.province" disabled placeholder="请选择省"></el-input>
@@ -156,7 +156,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :span="24">
-								<el-form-item label="" prop="address">
+								<el-form-item label="">
 									<el-row :gutter="20">
 										<el-col :span="24">
 											<el-input type="text" v-model="formData.address" :disabled="true" placeholder="详细地址"></el-input>

src/views/auxiliaryFittings/salesManagement/components/attachmentSalesOrderDetail.vue

@@ -194,7 +194,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :span="24">
-								<el-form-item label="" prop="address">
+								<el-form-item label="">
 									<el-row :gutter="20">
 										<el-col :span="24">
 											<el-input type="text" v-model="formData.project.address" :disabled="true" placeholder="详细地址"></el-input>

src/views/auxiliaryFittings/salesManagement/components/auxiliarySalesOrderDetail.vue

@@ -176,7 +176,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :span="24">
-								<el-form-item label="项目地址" prop="province" :required="true">
+								<el-form-item label="项目地址" :required="true">
 									<el-row>
 										<el-col :span="5" style="margin-right: 12px;">
 											<el-input type="text" v-model="formData.project.province" disabled placeholder="请选择省"></el-input>
@@ -194,7 +194,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :span="24">
-								<el-form-item label="" prop="address">
+								<el-form-item label="">
 									<el-row :gutter="20">
 										<el-col :span="24">
 											<el-input type="text" v-model="formData.project.address" :disabled="true" placeholder="详细地址"></el-input>

src/views/auxiliaryFittings/salesManagement/components/auxiliarySalesReturnOrderDetail.vue

@@ -138,7 +138,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :span="24">
-								<el-form-item label="项目地址" prop="province" :required="true">
+								<el-form-item label="项目地址" :required="true">
 									<el-row>
 										<el-col :span="5" style="margin-right: 12px;">
 											<el-input type="text" v-model="formData.province" disabled placeholder="请选择省"></el-input>
@@ -156,7 +156,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :span="24">
-								<el-form-item label="" prop="address">
+								<el-form-item label="">
 									<el-row :gutter="20">
 										<el-col :span="24">
 											<el-input type="text" v-model="formData.address" :disabled="true" placeholder="详细地址"></el-input>

src/views/userManagement/masterManagement/index.vue

@@ -384,7 +384,7 @@ export default {
             return row.examineStatus == 'OK'
           },
           click: ({ row, index, column }) => {
-            memberListPageV2({ "pageNum": 1, "pageSize": -1, "params": [{"param":"b.examine_status","compare":"=","value":"OK"}] }).then(res => {
+            memberListPageV2({ "pageNum": 1, "pageSize": -1, "params": [{"param":"b.examine_status","compare":"=","value":"OK"},{"param":"b.websit_id","compare":"=","value": row.websitId}] }).then(res => {
               this.suoyoushifu = res.data.records.filter(item => item.id != row.id).map(item => ({
                 label: item.nickName,
                 value: item.userId,