fix

virgo.wzfrontend/src/main/resources/static/workark/static/js/8144.e8ad7e14.js

@@ -1 +0,0 @@
-"use strict";(self["webpackChunkworkark"]=self["webpackChunkworkark"]||[]).push([[8144],{8144:function(s,k,a){s.exports=a.p+"static/img/zhuangshi.28725add.svg"}}]);

virgo.wzfrontend/workark/src/api/discount.js

@@ -0,0 +1,71 @@
+import request from '@/axios'
+/* 
+ * 通过条件获取优惠券模板列表
+ * 
+ * 
+ */
+export function getCouponModelListByQuery(data) {
+	return request({
+		url: `/api/workarkProductCouponModel/query`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 通过条件分页获取优惠券模板列表
+ * 
+ * 
+ */
+export function getCouponModelListByQueryAndPage(currPage, pageSize, data) {
+	return request({
+		url: `/api/workarkProductCouponModel/${currPage}/${pageSize}`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 通过id获取优惠券模板详情
+ * 
+ * 
+ */
+export function getCouponModelById(id) {
+	return request({
+		url: `/api/workarkProductCouponModel/${id}`,
+		method: 'get',
+	})
+}
+/* 
+ * 新增优惠券模板
+ * 
+ * 
+ */
+export function insertCouponModel(data) {
+	return request({
+		url: `/api/workarkProductCouponModel`,
+		method: 'post',
+		data: data
+	})
+}
+/* 
+ * 编辑优惠券模板
+ * 
+ * 
+ */
+export function updateCouponModel(data) {
+	return request({
+		url: `/api/workarkProductCouponModel/update`,
+		method: 'put',
+		data: data
+	})
+}
+/* 
+ * 删除优惠券模板
+ * 
+ * 
+ */
+export function deleteCouponModelById(id) {
+	return request({
+		url: `/api/workarkProductCouponModel/delete/${id}`,
+		method: 'delete'
+	})
+}

virgo.wzfrontend/workark/src/api/system.js

@@ -59,7 +59,7 @@ export function getOrganizedList(data) {
  */
 export function getServeDepartment() {
 	return request({
-		url: `/api/workarkProductLevel`,
+		url: `/api/workarkProductLevel/list`,
 		method: 'get'
 	})
 }
@@ -76,7 +76,7 @@ export function insertServeDepartment(data) {
 	})
 }
 /* 
- * 编辑资产目录
+ * 编辑服务目录
  * 
  * 
  */

virgo.wzfrontend/workark/src/assets/css/common.scss

@@ -216,6 +216,12 @@
 	
 	.hui-document {
 		padding: 0 !important;
+	}
+	
+	.el-input-number,
+	.el-select,
+	.el-cascader{
+		width: 100%;
 	}
 }
 //dialog
@@ -455,62 +461,30 @@
 }
 
 .hui-detail {
-	padding: 20px;
-
-	.hui-detail-title {
-		margin-bottom: 8px;
-		font-weight: 500;
-	}
+	padding:0 20px;
 
 	.hui-detail-content {
-		background: $--background-color-base;
-		border-radius: 8px;
-		margin-bottom: 20px;
-		padding: 8px 0;
-
 		.hui-detail-item {
-			display: flex;
-			padding: 8px 16px;
-			align-items: center;
-
+			padding-bottom: 16px;
+			
 			.hui-detail-label {
-				opacity: 0.5;
-				width: 56px;
-				margin-right: 14px;
+				min-height: 22px;
+				width: 100%;
+				color: #8f959e;
+				letter-spacing: 0;
+				padding-bottom: 8px;
 			}
 
 			.hui-detail-value {
-				flex: 1;
-				width: 0;
-				min-height: 20px;
-				line-height: 20px;
+				line-height: 22px;
+				white-space: normal;
 			}
+			
 			&.hui-detail-item-top{
 				align-items: start;
 			}
 		}
 	}
-
-	.hui-detail-image {
-		padding: 12px;
-	}
-
-	.hui-detail-document {
-		padding: 12px;
-	}
-
-	.hui-detail-cc {
-		padding: 16px;
-
-		.hui-detail-item {
-			padding: 0;
-		}
-
-		.hui-detail-label {
-			line-height: 28px;
-			width: 42px !important;
-		}
-	}
 }
 
 .hui-drawer-submit {
@@ -534,4 +508,15 @@
 			font-weight: 500;
 		}
 	}
+}
+.el-tabs {
+	.el-tabs__item{
+		font-weight: 400;
+		&.is-active{
+			font-weight: 500;
+		}
+	}
+	.el-tabs__nav-wrap::after{
+		height: 1;
+	}
 }

virgo.wzfrontend/workark/src/assets/css/element-variables.scss

@@ -14,7 +14,7 @@ $--color-text-secondary: #86909c !default;// 次要文字
 $--color-text-placeholder: #86909c !default; // 占位符
 
 // 边框颜色
-$--border-color-base: #86909c !default;  // 基础边框
+$--border-color-base: #c9cdd4 !default;  // 基础边框
 $--border-color-light: #c9cdd4 !default; // 浅色边框
 $--border-color-lighter: #e5e6eb !default;// 更浅边框
 $--border-color-extra-light: #F2F3F5 !default;

virgo.wzfrontend/workark/src/components/common/upload.vue

@@ -322,7 +322,7 @@
 		.common-update-image-box {
 			display: flex;
 			position: relative;
-			margin-right: 4px;
+			margin-right: 5px;
 		}
 
 		.common-update-image {

virgo.wzfrontend/workark/src/components/flow/flow.vue

@@ -123,8 +123,6 @@
 		height: 100%;
 
 		.flow-list {
-			padding: 10px 20px;
-
 			.flow-item {
 				position: relative;
 				display: flex;

virgo.wzfrontend/workark/src/components/flow/flowDetail.vue

@@ -2,34 +2,41 @@
 	<div class="hui-flex">
 		<div class="hui-flex-box">
 			<div class="hui-detail">
-				<div class="hui-detail-title">基本信息</div>
-				<property-flow-detail v-if="detail.flowType === 1" :formData="detail"></property-flow-detail>
-				<change-flow-detail v-if="detail.flowType === 2" :formData="detail"></change-flow-detail>
-				<depreciation-flow-detail v-if="detail.flowType === 3" :formData="detail"></depreciation-flow-detail>
-				<inventory-flow-detail v-if="detail.flowType === 4" :formData="detail"></inventory-flow-detail>
-				<device-flow-detail v-if="detail.flowType === 5" :formData="detail"></device-flow-detail>
-				<div class="hui-detail-title">流程附件</div>
-				<div class="hui-detail-content hui-detail-image">
-					<upload ref="upload" :list="detail.attachment ? JSON.parse(detail.attachment) : []" type="preview">
-					</upload>
-				</div>
-				<div class="hui-detail-title">流程抄送</div>
-				<div class="hui-detail-content hui-detail-cc">
-					<div class="hui-detail-item">
-						<div class="hui-detail-label">抄送人</div>
-						<div class="hui-detail-value">
-							<cc :ccList="detail.receiver ? JSON.parse(detail.receiver) : []"></cc>
+				<el-tabs>
+					<el-tab-pane label="基础信息">
+						<property-flow-detail v-if="detail.flowType === 1" :formData="detail"></property-flow-detail>
+						<change-flow-detail v-if="detail.flowType === 2" :formData="detail"></change-flow-detail>
+						<depreciation-flow-detail v-if="detail.flowType === 3"
+							:formData="detail"></depreciation-flow-detail>
+						<inventory-flow-detail v-if="detail.flowType === 4" :formData="detail"></inventory-flow-detail>
+						<device-flow-detail v-if="detail.flowType === 5" :formData="detail"></device-flow-detail>
+					</el-tab-pane>
+					<el-tab-pane label="流程文件">
+						<div class="hui-detail-content">
+							<div class="hui-detail-item">
+								<div class="hui-detail-label">流程附件</div>
+								<div class="hui-detail-value">
+									<upload ref="upload" :list="detail.attachment ? JSON.parse(detail.attachment) : []"
+										type="preview">
+									</upload>
+								</div>
+							</div>
+							<div class="hui-detail-item">
+								<div class="hui-detail-label">抄送人</div>
+								<div class="hui-detail-value">
+									<cc :ccList="detail.receiver ? JSON.parse(detail.receiver) : []"></cc>
+								</div>
+							</div>
 						</div>
-					</div>
-				</div>
-				<div class="hui-detail-title">审核流程</div>
-				<div class="hui-detail-content" style="margin-bottom: 10px;">
-					<flow :flowlist="flowUserList"></flow>
-				</div>
+					</el-tab-pane>
+					<el-tab-pane label="审核流程">
+						<flow :flowlist="flowUserList"></flow>
+					</el-tab-pane>
+				</el-tabs>
 			</div>
 		</div>
 		<div class="hui-drawer-submit" v-if="activeList.length>0">
-			<el-button size="medium" type="primary" v-for="item in activeList" :key="item.id" @click="action(item)">
+			<el-button size="small" type="primary" v-for="item in activeList" :key="item.id" @click="action(item)">
 				{{item.viewName}}
 			</el-button>
 		</div>
@@ -45,6 +52,7 @@
 <script>
 	const upload = () => import('@/components/common/upload');
 	const flowAction = () => import('@/components/flow/flowAction');
+	const flow = () => import('@/components/flow/flow');
 	const cc = () => import('@/components/common/cc');
 	const propertyFlowDetail = () => import('@/components/work/property/propertyFlowDetail');
 	const changeFlowDetail = () => import('@/components/work/property/changeFlowDetail');

virgo.wzfrontend/workark/src/components/flow/flowForm.vue

@@ -80,11 +80,12 @@
 				let data = this.$refs.flowData.returnForm();
 				let formData = data.formData;
 				let commonForm = data.commonForm;
+				formData['attachment'] = JSON.stringify(this.$refs.upload.fileList);
 				let commonData = {
 					flowUserList: JSON.stringify(this.$refs.flow.list),
 					receiver: JSON.stringify(this.$refs.cc.list),
 					attachment: JSON.stringify(this.$refs.upload.fileList),
-					flowType: this.flowType,
+					flowType: this.flowType,
 					projectId: this.$store.getters.project.id,
 					organizationId: this.$store.getters.organization.id
 				}