维保详情修改

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

@@ -253,10 +253,9 @@ export default {
 	setTableDom(data,html,websitHtml,totalAmount,num,length,page) {
 	  return `
 	   <div style="font-family:'黑体';font-size: 16px;">
-			<div style="display: flex;justify-content: space-between;align-items: center;">
-				<div style="width: 28%;"></div>
+			<div style="display: flex;justify-content: center;align-items: center;position: relative;">
 				<h1 style="text-align:center;margin: 10px 0;">${data.websitName}销售单</h1>
-				<div>共 ${length}页 第 ${page+1} 页</div>
+				<div style="position: absolute;right:0;">共 ${length}页 第 ${page+1} 页</div>
 			</div>
 		  <div style="display: flex;justify-content: space-between;">
 			<div style="width: 28%;"></div>
@@ -267,10 +266,9 @@ export default {
 		  	<div>客户: ${data.workerName}</div>
 		  	<div>摘要: ${data.payType == 'CASH'?'现金':'微信'}</div>
 		  </div>
-		  <div style="display: flex;justify-content: space-between;font-size: 16px;margin-bottom: 10px;">
+		  <div style="display: flex;font-size: 16px;margin-bottom: 10px;">
 		  	<div>联系电话: ${data.workerMobile}</div>
-		  	<div>收货地址: </div>
-			<div style="width: 28%;"></div>
+		  	<div style="margin-left: 50px;">收货地址: </div>
 		  </div>
 	      <div >
 	        <table border=".5" cellspacing="0" width="856"

src/views/engineeringMaintenance/basicData/detail.vue

@@ -58,7 +58,11 @@
 							</el-col>
 							<el-col :span="12">
 								<el-form-item label="包含全部费用" prop="isAllFee" :required="true">
-									<el-radio-group v-model="formData.isAllFee">
+									<el-radio-group v-model="formData.isAllFee" @change="(e)=>{
+										if(e == 'YES'){
+											formData.feePayMethod = ''
+										}
+									}">
 									    <el-radio :disabled="formType==2" label="YES">是</el-radio>
 									    <el-radio :disabled="formType==2" label="NO">否</el-radio>
 									</el-radio-group>
@@ -264,6 +268,12 @@
 									</el-form-item>
 								</template>
 							</el-table-column>
+							<el-table-column label="操作" align="right" width="140">
+								<template slot-scope="scope" v-if="formType != 2">
+									<el-button size="mini" type="primary" v-if="scope.$index != isEdit" @click="isEdit = scope.$index">编辑</el-button>
+									<el-button size="mini" type="danger" @click="del(scope.$index)">删除</el-button>
+								</template>
+							</el-table-column>
 						</el-table>
 					</el-form>
 					<!-- 服务网点 -->
@@ -310,6 +320,12 @@
 									</el-form-item>
 								</template>
 							</el-table-column>
+							<el-table-column label="操作" align="right" width="140">
+								<template slot-scope="scope" v-if="formType != 2">
+									<el-button size="mini" type="primary" v-if="scope.$index != isEdit" @click="isEdit = scope.$index">编辑</el-button>
+									<el-button size="mini" type="danger" @click="del(scope.$index)">删除</el-button>
+								</template>
+							</el-table-column>
 						</el-table>
 					</el-form>
 				</div>
@@ -374,7 +390,7 @@
 					endTime: '',
 					orderSmallTypeText: '安装',
 					isAllFee: 'YES',
-					feePayMethod: 'EXAMINE',
+					feePayMethod: '',
 					province: '',
 					provinceId: '',
 					city: '',
@@ -420,6 +436,9 @@
 					address: [
 						{ required: true, message: '请选择详细地址', trigger: 'change' }
 					],
+					feePayMethod: [
+						{ required: true, message: '请选择费用支付方式', trigger: 'change' }
+					],
 				},
 				rules1: {},
 				rules2: {},

src/views/engineeringMaintenance/basicData/index.vue

@@ -79,11 +79,11 @@ export default {
 	},
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
-		if (item.jname === 'imgUrl') {
+		if (item.jname === 'serviceCode') {
 		        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 style="cursor: pointer;display: flex">
+		              {row.serviceCode ? row.serviceCode.split(",").map(url => <el-image src={url} preview-src-list={[url]} fit="cover" style="width:80px;height:80px;" />) : null}
 		            </div>
 		          )
 		        }

src/views/setting/departmentManage/index.vue

@@ -77,7 +77,7 @@
         <el-form-item label="联系人电话" prop="websitPhone">
           <el-input placeholder="请输入联系人电话" maxlength="11" type="number" v-model="mainForm.websitPhone"></el-input>
         </el-form-item>
-        <el-form-item label="地址" prop="address" required>
+        <el-form-item label="地址" prop="address">
           <div style="display:flex;">
             <el-input placeholder="请选择地址" readonly style="margin-right: 20px;" v-model="mainForm.address"></el-input>
             <geographicalPosi :formData="mainForm" @selectPosi="selectAddress"></geographicalPosi>