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

src/api/workOrder/orderType.js

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

src/views/workOrder/basicConfiguration/assessmentItemAllocation/index.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/views/workOrder/basicConfiguration/orderType/index.vue

@@ -0,0 +1,395 @@
+<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" :exportList="exportList">
+	  <el-dialog title="" width="1200px" 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 { required, mobileRequired, mobile, httpUrl, email } from '@/components/template/rules_verify.js'
+import { listPageV2,pageExport, getDetail, save, del } from "@/api/workOrder/orderType";
+export default {
+  components: { TemplatePage, ImageUpload },
+  mixins: [import_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,
+		venderName: '',
+		linkName: '',
+		linkTel: '',
+		address: '',
+		zipNo: '',
+		email: '',
+		www: '',
+		telNo: '',
+		corporation: '',
+		faxNo: '',
+		licenseId: '',
+		khBank: '',
+		bankRow: '',
+		accNo: '',
+		remark: '',
+		status: 'ON',
+		venderType: 'M',
+		imageUrl: []
+      }
+    }
+  },
+  computed: {
+    // 更多参数
+    moreParameters() {
+      return []
+    },
+    formItems() {
+      return [{
+        md: 12,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入', disabled: true },
+        formItemAttributes: {
+          label: '所属商户',
+          prop: 'companyName',
+          rules: [...required]
+        },
+      }, {
+        md: 12,
+        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="ON">启用</el-radio>
+				    <el-radio disabled={this.formDialogType==2} label="OFF">禁用</el-radio>
+				</el-radio-group>
+			)
+		}
+      }, {
+        md: 12,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入供应商名称', },
+        formItemAttributes: {
+          label: '供应商名称',
+          prop: 'venderName',
+          rules: [...required]
+        }
+      }, {
+        md: 6,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入联系人' },
+        formItemAttributes: {
+          label: '联系人',
+          prop: 'linkName',
+          rules: [...required]
+        }
+      }, {
+        md: 6,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入联系电话', maxlength: 11 },
+        formItemAttributes: {
+          label: '联系电话',
+          prop: 'linkTel',
+          rules: [...required,...mobile]
+        }
+      }, {
+        md: 12,
+        isShow: true,
+        name: 'slot-component',
+        attributes: { },
+        formItemAttributes: {
+          label: '供应类型',
+          prop: 'venderType',
+          rules: [...required]
+        },
+		render: (h, { props, onInput }) => {
+			var { value } = props
+			return (
+				<el-radio-group v-model={this.formData.venderType}>
+				    <el-radio disabled={this.formDialogType==2} label="M">辅材</el-radio>
+				    <el-radio disabled={this.formDialogType==2} label="P">配件</el-radio>
+					<el-radio disabled={this.formDialogType==2} label="A">辅材和配件</el-radio>
+				</el-radio-group>
+			)
+		}
+      }, {
+        md: 12,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入地址' },
+        formItemAttributes: {
+          label: '地址',
+          prop: 'address',
+          rules: []
+        }
+      }, {
+        md: 6,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入邮编' },
+        formItemAttributes: {
+          label: '邮编',
+          prop: 'zipNo',
+          rules: []
+        }
+      }, {
+        md: 6,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入网址' },
+        formItemAttributes: {
+          label: '网址',
+          prop: 'www',
+          rules: [...httpUrl]
+        }
+      }, {
+        md: 6,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入电子邮箱' },
+        formItemAttributes: {
+          label: '电子邮箱',
+          prop: 'email',
+          rules: [...email]
+        }
+      }, {
+        md: 6,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入固定电话' },
+        formItemAttributes: {
+          label: '固定电话',
+          prop: 'telNo',
+          rules: []
+        }
+      }, {
+        md: 6,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入传真' },
+        formItemAttributes: {
+          label: '传真',
+          prop: 'faxNo',
+          rules: []
+        }
+      }, {
+        md: 6,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入法人名称' },
+        formItemAttributes: {
+          label: '法人',
+          prop: 'corporation',
+          rules: []
+        }
+      }, {
+        md: 6,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入营业执照号' },
+        formItemAttributes: {
+          label: '营业执照号',
+          prop: 'licenseId',
+          rules: []
+        }
+      }, {
+        md: 8,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入开户银行' },
+        formItemAttributes: {
+          label: '开户银行',
+          prop: 'khBank',
+          rules: []
+        }
+      }, {
+        md: 8,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入开户行号' },
+        formItemAttributes: {
+          label: '开户行号',
+          prop: 'bankRow',
+          rules: []
+        }
+      }, {
+        md: 8,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入银行账号' },
+        formItemAttributes: {
+          label: '银行账号',
+          prop: 'accNo',
+          rules: []
+        }
+      }, {
+		md: 24,
+		isShow: true,
+		name: 'slot-component',
+		formItemAttributes: {
+			label: '营业执照',
+			prop: 'imageUrl',
+			rules: []
+		},
+		render: (h, { props, onInput }) => {
+			var { value } = props
+			return (
+				<ImageUpload fileList={this.formData.imageUrl} limit={1} isEdit={this.formDialogType !== 2} />
+			)
+		}
+	}, {
+        md: 24,
+        isShow: true,
+        name: 'el-input',
+        attributes: { placeholder: '请输入备注内容',type: "textarea", rows: 5 },
+        formItemAttributes: {
+          label: '备注',
+          prop: 'remark',
+          rules: []
+        }
+      }]
+    }
+  },
+  methods: {
+    // 列表请求函数
+	getList(p) {
+	  try {
+	    var pam = JSON.parse(JSON.stringify(p))
+	    if (this.examineStatus) {
+	      pam.params.push({ "param": "b.examine_status", "compare": "=", "value": this.examineStatus })
+	    }
+	    return listPageV2(pam)
+	  } catch (error) {
+	    console.log(error)
+	  }
+	},
+    // 列表导出函数
+    exportList: pageExport,
+    // 表格列解析渲染数据更改
+    columnParsing(item, defaultData) {
+		if (item.jname === 'idCardImg') {
+		        defaultData.render = (h, { row, index, column }) => {
+		          return (
+		            <div style="padding:0 6px;cursor: pointer;">
+		              {row.idCardImg ? row.idCardImg.split(",").map(url => <el-image src={url} preview-src-list={[url]} fit="fit" style="width:80px;height:80px;" />) : null}
+		            </div>
+		          )
+		        }
+		      }
+      return defaultData
+    },
+    // 监听勾选变化
+    selectionChange(data) {
+      this.recordSelected = data
+    },
+    // 表格操作列
+    operation(h, { row, index, column }) {
+      return (
+        <div class='operation-btns'>
+          <el-button type="text" onClick={() => {
+            getDetail({ id: row.venderId }).then(res => {
+              Object.assign(this.formData, res.data,{
+				  imageUrl:res.data?.imageUrl ? res.data?.imageUrl?.split(",").map(item=>({url:item})) : []
+			  })
+              this.formDialogType = 2
+              this.openForm()
+            })
+          }}>查看</el-button>
+		  <el-button type="text" onClick={() => {
+		    getDetail({ id: row.venderId }).then(res => {
+		      Object.assign(this.formData, res.data,{
+				  imageUrl:res.data?.imageUrl?  res.data?.imageUrl?.split(",").map(item=>({url:item})) : []
+			  })
+			   console.log(this.formData)
+		      this.formDialogType = 1
+		      this.openForm()
+		    })
+		  }}>编辑</el-button>
+        </div>
+      )
+    },
+    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) {
+          ([add, edit][this.formDialogType])({
+			  ...this.formData,
+			  imageUrl:this.formData.imageUrl.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>

src/views/workOrder/basicConfiguration/settlementStandard/index.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/views/workOrder/orderHome/index.vue

@@ -0,0 +1,211 @@
+<template>
+	<div class="dashboard_container">
+		<div class="container_top">
+			<div class="tab" v-for="(item,index) in tabs" :key='index'>
+				<el-image :src="item.url" fit="fit"></el-image>
+				<div class="text">
+					<div class="title">{{item.title}}</div>
+					<div class="num">{{item.num}}</div>
+				</div>
+			</div>
+		</div>
+		<div class="container_center">
+			<div class="chart">
+				<div class="head">
+					<div class="title">近7天订单趋势</div>
+					<div class="more">查看更多</div>
+				</div>
+				<div ref="chart1" style="width: 100%;height: 280px;"></div>
+			</div>
+			<div class="chart">
+				<div class="head">
+					<div class="title">未来7天需上门</div>
+				</div>
+				<div ref="chart2" style="width: 100%;height: 280px;"></div>
+			</div>
+		</div>
+		<div class="container_bottom">
+			<div class="chart">
+				<div class="head">
+					<div class="title">近30天完工类型分布</div>
+				</div>
+				<div ref="chart3" style="width: 100%;height: 330px;"></div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	export default{
+		data(){
+			return {
+				tabs: [{title: '待派工',num: 12,url: ''},{title: '待接收',num: 22,url: ''},{title: '服务中',num: 53,url: ''},{title: '异常待处理',num: 2,url: ''},{title: '差评统计',num: 0,url: ''}]
+			}
+		},
+		created() {
+			
+		},
+		mounted() {
+			this.drawChat1()
+		},
+		methods: {
+			drawChat1(){
+				let chart1 = this.$echarts.init(this.$refs.chart1)
+				let chart2 = this.$echarts.init(this.$refs.chart2)
+				let chart3 = this.$echarts.init(this.$refs.chart3)
+				let option1 = {
+					tooltip: {
+					    trigger: 'axis'
+					},
+					legend: {
+					    data: ['新增工单', '完工工单', '进行中']
+					},
+					xAxis: {
+						type: 'category',
+						data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+					},
+					yAxis: {
+						type: 'value'
+					},
+					series: [
+						{
+							name: '新增工单',
+							data: [820, 932, 901, 934, 1290, 1330, 2320],
+							type: 'line',
+							smooth: true
+						},{
+							name: '完工工单',
+							data: [420, 532, 801, 234, 1790, 1030, 3320],
+							type: 'line',
+							smooth: true
+						},{
+							name: '进行中',
+							data: [120, 532, 901, 1234, 1790, 1530, 1920],
+							type: 'line',
+							smooth: true
+						}
+					]
+				};
+				let option2 = {
+					xAxis: {
+						type: 'category',
+						data: ['12-17', '12-18', '12-19', '12-20', '12-21', '12-22', '12-23']
+					},
+					yAxis: {
+						type: 'value'
+					},
+					series: [
+						{
+							name: '',
+							data: [820, 932, 901, 934, 1290, 1330, 2320],
+							type: 'line',
+							smooth: true
+						}
+					]
+				};
+				let option3 = {
+					tooltip: {
+					    trigger: 'axis'
+					},
+					legend: {
+					    data: ['安装', '维修', '清洗']
+					},
+					xAxis: {
+						type: 'category',
+						data: ['11-24', '11-25', '11-26', '11-27', '11-28', '11-29', '11-30', '12-01', '12-02', '12-03', '12-04', '12-05', '12-06', '12-07', '12-08', '12-09', '12-10', '12-11', '12-12', '12-13', '12-14', '12-15', '12-16', '12-17', '12-18', '12-19', '12-20', '12-21', '12-22', '12-23']
+					},
+					yAxis: {
+						type: 'value'
+					},
+					series: [
+						{
+							name: '安装',
+							data: [820, 932, 901, 934, 1290, 1330, 2320, 320, 632, 301, 234, 1230, 1330, 1320,1220, 932, 511, 994, 1290, 1130, 1520,1220, 1232, 951, 2134, 1290, 5210, 2220,3420, 1932],
+							type: 'line',
+							smooth: true
+						},{
+							name: '维修',
+							data: [420, 532, 801, 234, 1790, 1030, 3320, 820, 932, 901, 934, 1290, 1330, 2320,820, 932, 901, 934, 1290, 1330, 2320,820, 932, 901, 934, 1290, 1330, 2320,820, 932],
+							type: 'line',
+							smooth: true
+						},{
+							name: '清洗',
+							data: [120, 532, 901, 1234, 1790, 1530, 1920, 1120, 532, 201, 534, 1190, 1230, 2320,2520, 222, 1111, 934, 4390, 2230, 2320, 1520, 922, 551, 224, 3520, 1230, 1620, 1820, 232],
+							type: 'line',
+							smooth: true
+						}
+					]
+				};
+				chart1.setOption(option1)
+				chart2.setOption(option2)
+				chart3.setOption(option3)
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.dashboard_container{
+		background: #f5f5f5;
+		padding: 20px;
+		min-height: calc(100vh - 86px);
+		box-sizing: border-box;
+		.container_top{
+			display: flex;
+			.tab{
+				display: flex;
+				align-items: center;
+				flex: 1;
+				padding: 20px;
+				margin-right: 20px;
+				background-color: #ffffff;
+				border-radius: 10px;
+				.text{
+					margin-left: 30px;
+					.title{
+						color: #666666;
+						font-size: 16px;
+						margin-bottom: 8px;
+					}
+					.num{
+						font-size: 26px;
+						font-weight: bold;
+					}
+				}
+			}
+			.tab:last-child{
+				margin-right: 0;
+			}
+		}
+		.container_center{
+			display: flex;
+			margin: 10px 0;
+			margin-top: 20px;
+			.chart{
+				flex: 1;
+				height: 300px;
+				background-color: #ffffff;
+				margin-right: 20px;
+			}
+			.chart:last-child{
+				margin-right: 0;
+			}
+		}
+		.container_bottom{
+			width: 100%;
+			height: 350px;
+			background-color: #ffffff;
+		}
+		.head{
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+			padding: 16px 20px;
+			font-weight: bold;
+			.more{
+				color: #1d82ff;
+				cursor: pointer;
+			}
+		}
+	}
+</style>

src/views/workOrder/settleAccountsManagement/rewardsPunishmentsOrder/index.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/views/workOrder/settleAccountsManagement/settleAccountsOrder/index.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/views/workOrder/settleAccountsManagement/summaryBill/index.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>