结算管理修改

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

@@ -11,7 +11,7 @@
 					<el-row :gutter="20" justify="start">
 						<el-col :span="12" v-if="id">
 							<el-form-item label="单据状态">
-								<el-input type="text" :value="formData.flag == 'SAVE'?'已保存':formData.flag == 'OK'?'审核通过':formData.flag == 'OK'?'FAIL':''" disabled></el-input>
+								<el-input type="text" :value="formData.flag == 'SAVE'?'已保存':formData.flag == 'SUBMIT'?'已提交':formData.flag == 'OK'?'审核通过':formData.flag == 'FAIL'?'审核失败':''" disabled></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="12" v-if="id">
@@ -74,7 +74,7 @@
 			<div slot="header" class="clearfix">
 				<span>辅材信息</span>
 			</div>
-			<el-button size="small" type="primary" @click="add()">添加</el-button>
+			<el-button size="small" v-if="formData.flag == 'SAVE' || formType==0" type="primary" @click="add()">添加</el-button>
 			<div class="table">
 				<el-table :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
 					<el-table-column label="大类名称" align="center">

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

@@ -1,17 +1,25 @@
 <template>
-	<template-page ref="pageRef" :get-list="getList" :table-attributes="tableAttributes" :table-events="tableEvents" :operationColumnWidth="50"
-	  :options-evens-group="optionsEvensGroup" :moreParameters="moreParameters" :column-parsing="columnParsing"
-	  :operation="operation" :exportList="exportList">
-	</template-page>
+	<div class="page">
+		<template-page v-show="!formDialog" ref="pageRef" :get-list="getList" :table-attributes="tableAttributes" :table-events="tableEvents" :operationColumnWidth="50"
+		  :options-evens-group="optionsEvensGroup" :moreParameters="moreParameters" :column-parsing="columnParsing"
+		  :operation="operation" :exportList="exportList">
+		</template-page>
+		<div class="detail" v-if="formDialog">
+			<auxiliarySalesOrderDetail v-if="goosType == 'P'" :id="id" @back="backList" :formType="2" title="辅材销售订单详情"></auxiliarySalesOrderDetail>
+			<attachmentSalesOrderDetail v-else :id="id" @back="backList" :formType="2" title="配件销售订单详情"></attachmentSalesOrderDetail>
+		</div>
+	</div>
 </template>
 
 <script>
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
+import auxiliarySalesOrderDetail from '../components/auxiliarySalesOrderDetail.vue'
+import attachmentSalesOrderDetail from '../components/attachmentSalesOrderDetail.vue'
 import { downloadFiles } from '@/utils/util'
 import { listPageV2,pageExport } from "@/api/auxiliaryFittings/transaction";
 export default {
-  components: { TemplatePage },
+  components: { TemplatePage, auxiliarySalesOrderDetail, attachmentSalesOrderDetail},
   mixins: [import_mixin],
   data() {
     return {
@@ -29,6 +37,9 @@ export default {
       // 勾选选中行
       recordSelected: [],
       /** 表单变量 */
+	  id: '',
+	  goosType: 'P',
+	  formDialog: false
     }
   },
   computed: {
@@ -39,7 +50,7 @@ export default {
   },
   methods: {
     // 列表请求函数
-	getList: listPageV2,
+		getList: listPageV2,
     // 列表导出函数
     exportList: pageExport,
     // 表格列解析渲染数据更改
@@ -55,16 +66,26 @@ export default {
       return (
         <div class='operation-btns'>
 		  <el-button type="text" onClick={() => {
-		    
+			this.id = row.orderId
+			this.goodsType = row.goodsType
+			this.formDialog = true
 		  }}>查看</el-button>
         </div>
       )
-    }
+    },
+	backList() {
+		this.id = ''
+		this.formDialog = false;
+		this.$refs.pageRef.refreshList()
+	},
   }
 }
 </script>
 
 <style lang="scss" scoped>
+	.page{
+		height: 100%;
+	}
 	.tab{
 		padding: 20px 20px 0 20px;
 	}

src/views/auxiliaryFittings/settleAccountManagement/settleAccount/index.vue

@@ -58,11 +58,11 @@
 						<td class="bold" align="center">创建时间</td>
 						<td>{{formData.createTime}}</td>
 						<td class="bold" align="center">支付状态</td>
-						<td>{{formData.payStatus}}</td>
+						<td>{{formData.payStatus == 'CANCEL'?'取消':formData.payStatus == 'PAID'?'已支付':formData.payStatus == 'WAIT'?'待支付':''}}</td>
 					</tr>
 					<tr>
 						<td class="bold" align="center">支付订单号</td>
-						<td>{{formData.payStatus}}</td>
+						<td>{{formData.orderId}}</td>
 						<td class="bold" align="center">支付时间</td>
 						<td>{{formData.payTime}}</td>
 					</tr>
@@ -140,7 +140,7 @@
 			</el-card>
 		  <div slot="footer" class="dialog-footer">
 			<el-button size="mini" @click="formDialog = false;formData = {}">取 消</el-button>
-			<el-button size="mini" v-if="formDialogType !== 2" type="primary" @click="formConfirm()">确认结算</el-button>
+			<!-- <el-button size="mini" v-if="formDialogType !== 2" type="primary" @click="formConfirm()">确认结算</el-button> -->
 		  </div>
 		</el-dialog>
 	</template-page>