更新文档3

src/components/common/dialog/DataReview/assetsInfo.vue

@@ -22,6 +22,14 @@
       摘牌申请详情：
       <a :href="contentDatas.asset_data.delist" class="p_info_a">点击下载</a>
     </p>
+    <p class="p_info" v-if="contentDatas.asset_data.asset_file!=null">
+      资产挂牌申请详情：
+      <a :href="contentDatas.asset_data.asset_file" class="p_info_a">点击下载</a>
+    </p>
+    <p class="p_info" v-if="contentDatas.asset_data.else_serial_file!=null">
+      其他资产材料详情：
+      <a :href="contentDatas.asset_data.else_serial_file" class="p_info_a">点击下载</a>
+    </p>
   </div>
 </template>
 <script>

src/components/common/dialog/insex.vue

@@ -194,13 +194,13 @@ export default {
           {title:'商家概况',type:1,id:'businessInfo'},{title:'资产概况',type:1,id:'assetsInfo'},
           {title:'文化大数据标准编号',type:1,id:'dataNumber'}
         ]
-        if (this.contentDatas.asset_data.else_serial_file.length>0) {
+        if (this.contentDatas.asset_data.else_serial_file!=null) {
           this.dialogData.sidebar.splice(2, 0, {title:'资产评估/资产评价报告',type:1,id:'asset_valuation'});
         }
         if (this.assets_type==1) {
           this.dialogData.title='资产信息';
         }else if(this.assets_type==2){
-          this.dialogData.title='资产托管审核';
+          this.dialogData.title='资产挂牌申请';
         }
         else if(this.assets_type==4){
           this.dialogData.title='摘牌申请审核';

src/components/common/orderDialog/index.vue

@@ -5,16 +5,22 @@
         请在 {{orderInfos.order.pay_overdue_time | formatDate }}前完成订单支付！
       </p>
       <div class="steps">
-        <el-steps :active="orderInfos.order.status" align-center>
-          <el-step title="下单成功" description=""></el-step>
-          <el-step title="等待付款" description=""></el-step>
-          <el-step title="付款成功" description=""></el-step>
-          <el-step title="等待公示" description=""></el-step>
-          <el-step title="公示完毕" description=""></el-step>
-          <el-step title="等待交付" description=""></el-step>
-          <el-step title="交付成功" description=""></el-step>
-          <el-step title="等待结算" description=""></el-step>
-          <el-step title="订单完成" description=""></el-step>
+        <el-steps :active="orderInfos.order.status " align-center>
+          <template v-if="orderInfos.order.type==0">
+            <el-step title="待付款" description=""></el-step>
+            <el-step title="待审核付款" description=""></el-step>
+            <el-step title="待上传签约合同" description=""></el-step>
+            <el-step title="待确认签约合同" description=""></el-step>
+            <el-step title="待交付" description=""></el-step>
+            <el-step title="待确认交付" description=""></el-step>
+            <el-step title="待结算" description=""></el-step>
+            <el-step title="已完成" description=""></el-step>
+          </template>
+          <template v-else>
+            <el-step title="下单成功" description=""></el-step>
+            <el-step title="等待付款" description=""></el-step>
+            <el-step title="订单完成" description=""></el-step>
+          </template>
         </el-steps>
       </div>
       <div class="order_title">
@@ -37,18 +43,26 @@
             <p class="order_info_p">收货人电话：{{orderInfos.order.express_userphone}} </p>
             <p class="order_info_p">邮政编码：{{orderInfos.order.postal_code}} </p>
           </el-tab-pane>
-          <el-tab-pane label="订单合同" name="second" :disabled="orderInfos.order.status<4">
+          <el-tab-pane label="订单合同" name="second" :disabled="orderInfos.order.status<4" v-if="orderInfos.order.type==0">
             <p class="order_info_p1">
-              摘牌方签约合同
+              摘牌方签约合同详情
               <a :href="orderInfos.order.buy_contract" download class="upload_span">点击下载</a>
             </p>
             <p class="order_info_p1">
-              挂牌方签约合同
+              挂牌方签约合同详情
               <a :href="orderInfos.order.sell_contract" download class="upload_span">点击下载</a>
             </p>
           </el-tab-pane>
-          <el-tab-pane label="成交公示" name="third" :disabled="orderInfos.order.status>=6">角色管理</el-tab-pane>
-          <el-tab-pane label="交易账单" name="fourth">定时任务补偿</el-tab-pane>
+          <el-tab-pane label="交易凭证" name="third" :disabled="orderInfos.order.status<6">
+            <p class="order_info_p1">
+              交易凭证详情
+              <a :href="orderInfos.order.buy_contract" download class="upload_span">点击下载</a>
+            </p>
+          </el-tab-pane>
+          <el-tab-pane label="交易账单" name="fourth">
+            <p class="order_info_p">订单金额：{{orderInfos.order.total_price}} </p>
+            <p class="order_info_p">结算金额：{{orderInfos.order.settlement_price}} </p>
+          </el-tab-pane>
         </el-tabs>
         <div class="order_switch">
           <span>订单状态</span>
@@ -56,7 +70,7 @@
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="settlement" v-if="orderInfos.order.status==5">结 算</el-button>
+        <el-button type="primary" @click="settlement" v-if="orderInfos.order.status==6">结 算</el-button>
         <el-button @click="MisShow">返 回</el-button>
       </span>
     </el-dialog>
@@ -70,6 +84,10 @@
           v-model="query.message">
         </el-input>
       </div>
+      <div class="msg1">
+        <span>操作员：</span>
+        <el-input placeholder="请输入内容" v-model="query.operator_name" class="msg1_input"></el-input>
+      </div>
       <span slot="footer" class="dialog-footer">
           <el-button @click="editVisible2 = false">取 消</el-button>
           <el-button type="primary" @click="close">确 定</el-button>
@@ -102,7 +120,8 @@ export default ({
       },
       query:{
         message:'',
-        batchcode:''
+        batchcode:'',
+        operator_name:''
       },
       editVisible2:false
     }
@@ -118,6 +137,7 @@ export default ({
           console.info(res)
           if (res.code==100) {
               this.$message.success('结算订单成功！');
+              this.getData()
           }else{
               this.$message.error(res.msg)
           }
@@ -126,6 +146,8 @@ export default ({
     close(){
       if (this.query.message=='') {
         this.$message.error('请输入关闭订单的原因！')
+      }else if(this.query.operator_name==''){
+        this.$message.error('请输入操作员的名字！')
       }else{
         close(this.query).then(res=>{
             console.info(res)
@@ -169,6 +191,15 @@ export default ({
   .tips{
     font-size: 16px;
   }
+  .msg1{
+    /* display: flex;
+    align-items: center; */
+    margin-top: 15px;
+  }
+  .msg1>.msg1_input{
+    /* width: 80%; */
+    margin-top: 10px;
+  }
   .steps{
     margin-top: 30px;
     margin-bottom: 15px;

src/components/page/AssetManagement/assessmentOreder.vue

@@ -70,6 +70,11 @@
                         <span v-else-if="scope.row.status==8">已关闭</span>
                     </template>
                 </el-table-column>
+                <el-table-column  label="交易凭证" align="center">
+                    <template slot-scope="scope" >
+                        <img :src="scope.row.pay_record"  width="40" height="40" @click="onPreview([scope.row.pay_record])" v-if="scope.row.pay_record!=null">
+                    </template>
+                </el-table-column>
                 <el-table-column prop="auditID_name" label="审核人员"></el-table-column>
                 <el-table-column label="操作" width="280" align="center">
                     <template slot-scope="scope">
@@ -81,6 +86,11 @@
                             type="text"
                             @click="orderDetails(scope.$index, scope.row)"
                         >订单详情</el-button>
+                        <el-button
+                            type="text"
+                            v-if="scope.row.status==1"
+                            @click="examine(scope.$index, scope.row)"
+                        >付款审核</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -102,15 +112,43 @@
         <orderDialog v-if="orderShowVisible" :isshow="orderShowVisible" :batchcode="order_batchcode"
             @orderShow="orderShow"  >
         </orderDialog>
+        <el-image-viewer
+            v-if="showViewer"
+            :on-close="closeViewer"
+            :url-list="showBigImgList"
+        />
+        <el-dialog
+        title="付款审核"
+        :visible.sync="centerDialogVisible"
+        width="30%"
+        center>
+            <span>该订单的付款审核是否通过？</span>
+            <div class="selectExamine">
+                <el-radio v-model="query1.check_pay_status" :label="1">审核通过</el-radio>
+                <el-radio v-model="query1.check_pay_status" :label="2">审核不通过</el-radio>
+            </div>
+            <div class="messege" v-if="query1.check_pay_status==2">
+                <span>审核不通过原因：</span>
+                <el-input  placeholder="请输入" v-model="query1.content" class="handle-input mr10"></el-input>
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="centerDialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="selectExamine()">确 定</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 
 <script>
-import { orderList } from '../../../api/index';
+import { orderList ,orderCheckPay} from '../../../api/index';
+import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
 import moment from 'moment'
 export default {
     data() {
         return {
+            showViewer:false,
+            centerDialogVisible:false,
+            showBigImgList:[],
             orderShowVisible:false,
             order_batchcode:'',
             query: {
@@ -126,6 +164,11 @@ export default {
                 order_type:0,
                 type:1
             },
+            query1:{
+                batchcode:'',
+                check_pay_status:1,
+                content:''
+            },
             tableData: [],
             multipleSelection: [],
             delList: [],
@@ -168,12 +211,37 @@ export default {
     },
     components:{
         whyDialog: () => import('../../common/dialog/insex.vue'),
-        orderDialog: () => import('../../common/orderDialog/index.vue')
+        orderDialog: () => import('../../common/orderDialog/index.vue'),
+        ElImageViewer
     },
     created() {
         this.getData();
     },
     methods: {
+        selectExamine(){
+            orderCheckPay(this.query1).then(res=>{
+                console.info(res)
+                if (res.code==100) {
+                    this.$message.success('订单审核成功！');
+                }else{
+                    this.$message.error(res.msg);
+                }
+                this.centerDialogVisible=false
+                this.getData();
+            })
+        },
+        examine(index,row){
+            this.query1.batchcode=row.batchcode
+            this.centerDialogVisible=true
+        },
+        onPreview(url) {
+            this.showBigImgList=url;
+            this.showViewer = true
+        },
+        // 关闭查看器
+        closeViewer() {
+            this.showViewer = false
+        },
         MisShow(){
             this.editVisible=false
         },