Merge branch 'master' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin

src/api/workOrder/basicData.js

@@ -0,0 +1,37 @@
+import request, { postBlob, getBlob, handleImport } from '@/utils/request'
+
+// 获取列表
+export function listPageV2(data) {
+  return request({
+    url: `/engin/project/repair/list?moduleId=${data.moduleId}`,
+    method: 'post',
+    data
+  })
+}
+
+//导出
+export function pageExport(data, name) {
+  return postBlob({
+    url: '/engin/project/repair/list/export',
+    data,
+    name
+  })
+}
+
+// 保存
+export function save(data) {
+  return request({
+    url: `/engin/project/repair/save`,
+    method: 'post',
+    data
+  })
+}
+
+// 详情
+export function getDetail(params) {
+  return request({
+    url: `/engin/project/repair/detail`,
+    method: 'post',
+    params
+  })
+}

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

@@ -37,13 +37,11 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="购买方" :required="true" >
-								<el-form-item label="购买方" :required="true" style="padding-bottom: 1px;">
-									<el-radio-group v-model="formData.buyPeople">
-									    <el-radio :disabled="formData.flag != 'SAVE' && formType!=0" label="WORKER">内部师傅</el-radio>
-									    <el-radio :disabled="formData.flag != 'SAVE' && formType!=0" label="CUSTOMER">客户</el-radio>
-									</el-radio-group>
-								</el-form-item>
+							<el-form-item label="购买方" :required="true" style="padding-bottom: 1px;">
+								<el-radio-group v-model="formData.buyPeople">
+								    <el-radio :disabled="formData.flag != 'SAVE' && formType!=0" label="WORKER">内部师傅</el-radio>
+								    <el-radio :disabled="formData.flag != 'SAVE' && formType!=0" label="CUSTOMER">客户</el-radio>
+								</el-radio-group>
 							</el-form-item>
 						</el-col>
 						<template v-if="formData.buyPeople == 'CUSTOMER'">

src/views/workOrder/projectMaintenance/basicData/index.vue

@@ -0,0 +1,264 @@
+<template>
+	<template-page ref="pageRef" :get-list="getList" :table-attributes="tableAttributes" :table-events="tableEvents" :operationColumnWidth="80"
+	  :options-evens-group="optionsEvensGroup" :moreParameters="moreParameters" :column-parsing="columnParsing"
+	  :operation="operation()">
+	  <el-dialog title="" width="500px" custom-class="diy-dialog" append-to-body :modal="true" :visible.sync="formDialog"
+	    :show-close="true" :close-on-click-modal="false" :modal-append-to-body="false" :before-close="formCancel">
+	    <zj-form-container ref="formRef" :form-data="formData" :styleSwitch="false">
+	      <zj-form-module :title="formDialogTitles[formDialogType]" label-width="100px" :showPackUp="false"
+	        :form-data="formData" :form-items="formItems" :disabled="formDialogType==2">
+	      </zj-form-module>
+	    </zj-form-container>
+	    <div slot="footer" class="dialog-footer">
+			<el-button size="mini" @click="formCancel">取 消</el-button>
+			<el-button size="mini" v-if="formDialogType !== 2" type="primary" @click="formConfirm()">确定</el-button>
+	    </div>
+	  </el-dialog>
+	</template-page>
+</template>
+
+<script>
+import TemplatePage from '@/components/template/template-page-1.vue'
+import import_mixin from '@/components/template/import_mixin.js'
+import ImageUpload from '@/components/file-upload'
+import operation_mixin from '@/components/template/operation_mixin.js'
+import { required, mobileRequired, mobile, httpUrl, email } from '@/components/template/rules_verify.js'
+import { listPageV2,pageExport, getDetail, save } from "@/api/workOrder/basicData";
+export default {
+  components: { TemplatePage, ImageUpload },
+  mixins: [import_mixin, operation_mixin],
+  data() {
+    return {
+      // 事件组合
+      optionsEvensGroup: [
+	  	[
+	  		[
+	  			{
+	  				name: '新建',
+	  				click: this.addData
+	  			}
+	  		],
+	  	],
+	  ],
+      // 表格属性
+      tableAttributes: {
+        // 启用勾选列
+        selectColumn: false
+      },
+      // 表格事件
+      tableEvents: {
+        'selection-change': this.selectionChange
+      },
+      // 勾选选中行
+      recordSelected: [],
+      /** 表单变量 */
+      formDialogType: 0,
+      formDialogTitles: ["新增","编辑", "详情"],
+      formDialog: false,
+      formData: {
+		companyName: JSON.parse(localStorage.getItem('greemall_user')).companyName,
+		orderSmallTypeText: '',
+		orderType: '',
+		status: true,
+		sortNum: '',
+		imgUrl: []
+      }
+    }
+  },
+  computed: {
+    // 更多参数
+    moreParameters() {
+      return []
+    },
+	// 事件组合
+	optionsEvensGroup() {
+		return [
+			[
+				[
+					this.optionsEvensAuth("add", {
+						click: () => {
+							
+						}
+					})
+				],
+			]
+		]
+	},
+    formItems() {
+      return [{
+        md: 24,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入', disabled: true },
+        formItemAttributes: {
+          label: '所属商户',
+          prop: 'companyName',
+          rules: [...required]
+        },
+      }, {
+        md: 24,
+        isShow: true,
+        name: 'el-select',
+		options: [{label: '安装',value: 'INSTALL'},{label: '维修',value: 'REPAIR'}],
+        attributes: { placeholder: '请选择' },
+        formItemAttributes: {
+          label: '所属业务线',
+          prop: 'orderType',
+          rules: [...required]
+        },
+      }, {
+        md: 24,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入工单类型', },
+        formItemAttributes: {
+          label: '工单类型',
+          prop: 'orderSmallTypeText',
+          rules: [...required]
+        }
+      },{
+        md: 24,
+        isShow: true,
+        name: 'slot-component',
+        attributes: { },
+        formItemAttributes: {
+          label: '状态',
+          prop: 'status',
+          rules: [...required]
+        },
+		render: (h, { props, onInput }) => {
+			var { value } = props
+			return (
+				<el-radio-group v-model={this.formData.status}>
+				    <el-radio disabled={this.formDialogType==2} label={true}>启用</el-radio>
+				    <el-radio disabled={this.formDialogType==2} label={false}>禁用</el-radio>
+				</el-radio-group>
+			)
+		}
+      }, {
+        md: 24,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '排序数字越小越靠前', type: 'number' },
+        formItemAttributes: {
+          label: '排序',
+          prop: 'sortNum',
+          rules: []
+        }
+      }, {
+		md: 24,
+		isShow: true,
+		name: 'slot-component',
+		formItemAttributes: {
+			label: '上传图片',
+			prop: 'imgUrl',
+			rules: [...required]
+		},
+		render: (h, { props, onInput }) => {
+			var { value } = props
+			return (
+				<div>
+					<ImageUpload fileList={this.formData.imgUrl} fileType={['image']} limit={1} isEdit={this.formDialogType !== 2} />
+					<div style="color: #EA8000">上传后在小程序首页自助服务展示</div>
+				</div>
+			)
+		}
+	}]
+    }
+  },
+  methods: {
+    // 列表请求函数
+	getList: listPageV2,
+    // 列表导出函数
+    exportList: pageExport,
+    // 表格列解析渲染数据更改
+    columnParsing(item, defaultData) {
+		if (item.jname === 'imgUrl') {
+		        defaultData.render = (h, { row, index, column }) => {
+		          return (
+		            <div style="padding:0 6px;cursor: pointer;">
+		              {row.imgUrl ? row.imgUrl.split(",").map(url => <el-image src={url} preview-src-list={[url]} fit="cover" style="width:80px;height:80px;" />) : null}
+		            </div>
+		          )
+		        }
+		      }
+      return defaultData
+    },
+    // 监听勾选变化
+    selectionChange(data) {
+      this.recordSelected = data
+    },
+    // 表格操作列
+    operation() {
+		return this.operationBtn({
+		  edit: {
+		    click: ({ row, index, column }) => {
+		      getDetail({ id: row.id }).then(res => {
+		        Object.assign(this.formData, res.data,{
+		      	  imgUrl:res.data?.imgUrl?  res.data?.imgUrl?.split(",").map(item=>({url:item})) : []
+		        })
+		         console.log(this.formData)
+		        this.formDialogType = 1
+		        this.openForm()
+		      })
+		    }
+		  },
+		  detail: {
+		    click: ({ row, index, column }) => {
+		      getDetail({ id: row.id }).then(res => {
+		        Object.assign(this.formData, res.data,{
+		      	  imgUrl:res.data?.imgUrl?  res.data?.imgUrl?.split(",").map(item=>({url:item})) : []
+		        })
+		         console.log(this.formData)
+		        this.formDialogType = 2
+		        this.openForm()
+		      })
+		    }
+		  },
+		  expenseApply: {
+		    click: ({ row, index, column }) => {
+		      
+		    }
+		  },
+		  serviceOrderDetail: {
+		    click: ({ row, index, column }) => {
+		      
+		    }
+		  }
+		})
+    },
+    addData() {
+      this.formDialogType = 0
+      this.openForm()
+    },
+    openForm() {
+      this.formDialog = true;
+    },
+    formCancel() {
+      this.$refs.formRef.$refs.inlineForm.clearValidate()
+      this.$data.formData = this.$options.data().formData
+      this.formDialog = false
+    },
+    formConfirm() {
+      this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
+        if (valid) {
+          (save)({
+			  ...this.formData,
+			  imgUrl:this.formData.imgUrl.map(item=>item.url).join(",")
+		  }).then(res => {
+            this.$message({ type: 'success', message: `${this.formDialogTitles[this.formDialogType]}成功!` })
+            this.formCancel()
+            this.$refs.pageRef.refreshList()
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+	.tab{
+		padding: 20px 20px 0 20px;
+	}
+</style>