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

src/views/workOrder/workOrderPool/detailModule/Payment/index.vue

@@ -55,16 +55,16 @@ export default {
         render: (h, { props, onInput }) => {
           var { formData } = props
           return (
-            <el-descriptions border title="" column={3} colon={false} labelStyle={{ width: '10%' }} contentStyle={{ width: '23.3%' }}>
+            <el-descriptions border title="" column={3} colon={false} labelStyle={{ width: '11%' }} contentStyle={{ width: '22.3%' }}>
               <el-descriptions-item label="网点名称">
                 {formData.websitName}
               </el-descriptions-item>
               <el-descriptions-item label="工单号">
                 {formData.workerOrderId}
               </el-descriptions-item>
-              <el-descriptions-item label="流水号">
+              {/* <el-descriptions-item label="流水号">
                 {formData.wechatOrder}
-              </el-descriptions-item>
+              </el-descriptions-item> */}
               <el-descriptions-item label="工程师名称">
                 {formData.workerName}
               </el-descriptions-item>
@@ -75,13 +75,13 @@ export default {
                 微信
               </el-descriptions-item>
               <el-descriptions-item label="客户名称">
-                {formData.userName}
+                {formData.pgOrderBase.userName}
               </el-descriptions-item>
               <el-descriptions-item label="电话号码">
                 {formData.userMobile}
               </el-descriptions-item>
               <el-descriptions-item label="支付状态">
-                {formData.payStatus}
+                {({ CANCEL: "取消", WAIT: "待支付", PAID: "已支付" })[formData.payStatus]}
               </el-descriptions-item>
               <el-descriptions-item label="支付总金额">
                 {formData.totalAmount}
@@ -174,6 +174,11 @@ export default {
                 columnAttributes: {
                   label: '交易类型',
                   prop: 'goodsType',
+                },
+                render: (h, { row }) => {
+                  return <div>
+                    {({ M: "辅材", P: "配件" })[row.goodsType]}
+                  </div>
                 }
               }, {
                 columnAttributes: {
@@ -184,6 +189,11 @@ export default {
                 columnAttributes: {
                   label: '交易状态',
                   prop: 'payStatus',
+                },
+                render: (h, { row }) => {
+                  return <div>
+                    {({ CANCEL: "取消", WAIT: "待支付", PAID: "已支付" })[row.payStatus]}
+                  </div>
                 }
               }, {
                 columnAttributes: {