From b9b77e1a1c8f12a5fe40deae1692c3f4452f4516 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 14 May 2024 11:33:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96-0514-=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/purchase/purContract.js               |   7 +
 .../purchase/purContract/purContract.vue      |  14 +-
 .../purContract/purContractDetailDialog.vue   | 447 +++++++++++-------
 .../purContract/purContractFinish.vue         |  16 +-
 .../purContract/purContractReviewed.vue       |  51 +-
 5 files changed, 335 insertions(+), 200 deletions(-)

diff --git a/src/api/purchase/purContract.js b/src/api/purchase/purContract.js
index 853a7840..4014ddf3 100644
--- a/src/api/purchase/purContract.js
+++ b/src/api/purchase/purContract.js
@@ -89,3 +89,10 @@ export function importPlan(data) {
 }
 
 
+export function auditOrder(data) {
+  return axios({
+    url: '/purchase/contract/auditOrder',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/views/purchase/purContract/purContract.vue b/src/views/purchase/purContract/purContract.vue
index ca93f88d..28fd5790 100644
--- a/src/views/purchase/purContract/purContract.vue
+++ b/src/views/purchase/purContract/purContract.vue
@@ -65,13 +65,15 @@
         <el-table-column label="往来单位/供应商" prop="fromCorp"></el-table-column>
         <el-table-column label="合同仓库" prop="invCode" :formatter="invCodeFormat"></el-table-column>
 
-<!--        <el-table-column label="合同状态" prop="status" :formatter="statusFormat"></el-table-column>-->
-        <el-table-column label="合同状态" prop="status"  width="230">
-          <template slot-scope="scope">
-            <el-tag :type="(scope.row.status == 0? 1:scope.row.status ) | statusFilterType">
+        <el-table-column label="合同状态" prop="status" >
+          <template slot-scope="scope" >
+            <el-tag :type="(scope.row.status == 0? 1:scope.row.status ) | statusFilterType" v-if="scope.row.approvalFlowId == null" >
               {{ statusMap[(scope.row.status == 0? 1:scope.row.status ) ] }}
             </el-tag>
-            <el-tag v-if="scope.row.nextNodeName !=  null && scope.row.nextNodeName != '' && scope.row.status == 2 " class="tag-right-align">
+            <el-tag :type="(scope.row.flowStatus == 0? 1:scope.row.flowStatus ) | statusFilterType" v-if="scope.row.approvalFlowId != null">
+              {{ statusMap[(scope.row.flowStatus == 0? 1:scope.row.flowStatus ) ] }}
+            </el-tag>
+            <el-tag v-if="scope.row.nextNodeName !=  null && scope.row.nextNodeName != '' && scope.row.flowStatus == 2 && scope.row.approvalFlowId != null" class="tag-right-align">
               <b v-if="scope.row.nextApprovalNodeType == 1">待人员</b>
               <b v-if="scope.row.nextApprovalNodeType == 2">待岗位</b>
               【{{ scope.row.nextNodeName }}】审核
@@ -94,7 +96,7 @@
             <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" v-show="(scope.row.status=='' || scope.row.status==1) " >删除</el-button>
 
             <el-button type="text" size="small" @click.native.stop="showApprovalFlowDetail(scope.row)"
-                       v-show=" scope.row.status != 1 && scope.row.status !=''  ">审批详情
+                       v-show=" scope.row.status != 1 && scope.row.status !='' && scope.row.approvalFlowId != null">审批详情
             </el-button>
 
           </template>
diff --git a/src/views/purchase/purContract/purContractDetailDialog.vue b/src/views/purchase/purContract/purContractDetailDialog.vue
index 8f5762bf..a1c3bd02 100644
--- a/src/views/purchase/purContract/purContractDetailDialog.vue
+++ b/src/views/purchase/purContract/purContractDetailDialog.vue
@@ -1,133 +1,225 @@
 <template>
   <div>
 
-    <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="120px">
+    <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="120px" :disabled="true">
       <el-row type="flex" justify="end" v-if="editType == 1">
-        <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
-          <el-button type="primary" @click.native="saveOrder('3')" :loading="loading">审核通过</el-button>
-          <el-button type="primary" @click.native="saveOrder('4')" :loading="loading">拒绝申请</el-button>
+        <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px" v-if="formData.approvalFlowId == null">
+          <el-button type="primary" @click.native="saveOrder('3')" :loading="loading" :disabled="false">审核通过</el-button>
+          <el-button type="primary" @click.native="saveOrder('4')" :loading="loading" :disabled="false">拒绝申请</el-button>
         </el-button-group>
       </el-row>
 
       <el-card style="margin-top: -5px;">
         <el-row>
-          <el-col :span="11">
-            <el-form-item label="采购单号:" prop="billNo">
-              <el-input v-model="formData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item label="创建时间:" prop="createTime">
-              <el-date-picker
-                :disabled="true"
-                v-model="formData.createTime"
-                type="datetime"
-                placeholder="选择日期"
-                style="width: 90%"
-                :clearable="false"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row style="margin-top: -10px">
-          <el-col :span="11">
-            <el-form-item label="紧急程度:" prop="emergency">
-              <el-select v-model="formData.emergency" :disabled="true" placeholder="请选择紧急程度" style="width: 90%"
-                         clearable>
-                <el-option label="正常" :value=1></el-option>
-                <el-option label="较急" :value=2></el-option>
-                <el-option label="特急" :value=3></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item label="到货截止:" prop="arrivalTime">
-              <el-date-picker
-                :disabled="true"
-                v-model="formData.arrivalTime"
-                type="datetime"
-                placeholder="选择日期"
-                style="width: 90%"
-                :clearable="false"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="11">
-            <el-form-item label="采购仓库:" prop="locStorageCode">
-              <el-select v-model="formData.invName" placeholder="采购仓库信息" style="width: 90%"
-                         :disabled="true" clearable>
-                <el-option
-                  v-for="item in subInvList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item label="审核说明:" prop="billNo">
-              <el-input v-model="formData.auditRemark" style="width: 90%" auto-complete="off" type="textarea"
-                        autosize></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+              <el-col :span="11">
+                <el-form-item label="合同编号:" prop="code">
+                  <el-input v-model="formData.code" auto-complete="off" ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="11">
+                <el-form-item label="合同名称:" prop="name">
+                  <el-input v-model="formData.name"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
 
+            <el-row>
+              <el-col :span="11">
+                <el-form-item label="合同仓库:" prop="invCode">
+                  <el-select v-model="formData.invCode" placeholder="合同仓库信息" style="width: 100%"
+                             clearable>
+                    <el-option
+                      v-for="item in invCodeList"
+                      :key="item.name"
+                      :label="item.name"
+                      :value="item.code">
+                      <span style="float: left">{{ item.name }}</span>
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="11">
+                <el-form-item label="合同签订日期:" prop="contractDate">
+                  <el-date-picker
+                    v-model="formData.contractDate"
+                    style="width: 100%"
+                    type="datetime"
+                    placeholder="选择日期"
+                    :clearable="false"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    :disabled-date="disabledArrivalDate"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
 
-        <el-row>
-          <el-col :span="11">
-            <el-form-item label="采购说明:" prop="billNo">
-              <el-input v-model="formData.remark" style="width: 90%" :disabled="true" auto-complete="off"
-                        type="textarea" autosize></el-input>
-            </el-form-item>
-          </el-col>
-          <!--                    <el-col :span="11">-->
-          <!--                        <el-form-item>-->
-          <!--                            <el-checkbox v-model="formData.autoPurchase">是否生成采购入库单</el-checkbox>-->
-          <!--                        </el-form-item>-->
-          <!--                    </el-col>-->
-
-        </el-row>
-        <el-row v-show="formData.autoPurchase">
-          <el-col :span="11">
-            <el-form-item label="入库仓库:" prop="locStorageCode">
-              <el-select v-model="formData.targetSubInv" placeholder="入库仓库信息" style="width: 90%"
-                         @change="targetInvChange" clearable>
-                <el-option
-                  v-for="item in tarSubList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="11">
-            <el-form-item label="入库单据类型:" class="query-form-item" prop="targetBillAction">
-              <el-select v-model="formData.targetBillAction" placeholder="请选择单据类型" style="width: 90%">
-                <el-option
-                  v-for="item in busTypes"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.action">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-
-        </el-row>
+            </el-row>
+
+            <el-row >
+              <el-col :span="11">
+                <el-form-item label="合同类型:" prop="type">
+                  <el-select v-model="formData.type" placeholder="合同类型" style="width: 100%"
+                             clearable>
+                    <el-option
+                      v-for="item in typeList"
+                      :key="item.name"
+                      :label="item.name"
+                      :value="item.code">
+                      <span style="float: left">{{ item.name }}</span>
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="11">
+                <el-form-item
+                  prop="fromCorp"
+                  label="供应商:"
+
+                >
+                  <el-select
+                    v-model="formData.fromCorp"
+                    filterable
+                    remote
+                    :disabled="corpOrderIdDisabled"
+                    clearable
+                    reserve-keyword
+                    placeholder="请选择供应商"
+                    :remote-method="findMethod"
+                    style="width: 100%"
+                  >
+                    <el-option
+                      v-for="item in fromOptions"
+                      :key="item.erpId"
+                      :label="item.name"
+                      :value="item.erpId"
+                    >
+                      <span style="float: left">{{ item.name }}</span>
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+
+            </el-row>
+
+            <el-row>
+
+              <!--          <el-col :span="11">-->
+              <!--            <el-form-item label="合同状态:" prop="status">-->
+              <!--              <el-select v-model="formData.status" placeholder="合同状态" style="width: 100%" disabled-->
+              <!--                         clearable>-->
+              <!--                <el-option-->
+              <!--                  v-for="item in statusList"-->
+              <!--                  :key="item.name"-->
+              <!--                  :label="item.name"-->
+              <!--                  :value="item.code">-->
+              <!--                  <span style="float: left">{{ item.name }}</span>-->
+              <!--                </el-option>-->
+              <!--              </el-select>-->
+              <!--            </el-form-item>-->
+              <!--          </el-col>-->
+
+
+
+              <el-col :span="11">
+                <el-form-item label="开始时间:" prop="startDate" >
+                  <el-date-picker
+                    style="width: 100%"
+                    v-model="formData.startDate"
+                    type="datetime"
+                    placeholder="选择日期"
+                    :clearable="false"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    :disabled-date="disabledArrivalDate"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="11">
+                <el-form-item label="截止时间:" prop="endDate">
+                  <el-date-picker
+                    style="width: 100%"
+                    v-model="formData.endDate"
+                    type="datetime"
+                    placeholder="选择日期"
+                    :clearable="false"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    :disabled-date="disabledArrivalDate"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+
+
+
+              <el-col :span="11">
+                <el-form-item label="订单金额:" prop="amount">
+                  <el-input-number
+                    style="width: 60%"
+                    :precision="2"
+                    :step="1"
+                    :min="0.00"
+                    v-model="formData.amount" size="small" ></el-input-number>
+                </el-form-item>
+              </el-col>
+              <el-col :span="11">
+                <el-form-item label="合同金额:" prop="payAmount">
+                  <el-input-number
+                    style="width: 60%"
+                    :precision="2"
+                    :step="1"
+                    :min="0.00"
+                    v-model="formData.payAmount" size="small" ></el-input-number>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+
+              <el-col :span="11">
+                <el-form-item label="付款日期:" prop="payDate">
+                  <el-date-picker
+                    style="width: 100%"
+                    v-model="formData.payDate"
+                    type="datetime"
+                    placeholder="选择日期"
+                    :clearable="false"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    :disabled-date="disabledArrivalDate"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="11">
+                <el-form-item label="付款方式:" prop="payType">
+                  <!--              <el-select v-model="formData.payType" placeholder="付款方式" style="width: 100%"-->
+                  <!--                         clearable>-->
+                  <!--                <el-option-->
+                  <!--                  v-for="item in payTypeList"-->
+                  <!--                  :key="item.name"-->
+                  <!--                  :label="item.name"-->
+                  <!--                  :value="item.code">-->
+                  <!--                  <span style="float: left">{{ item.name }}</span>-->
+                  <!--                </el-option>-->
+                  <!--              </el-select>-->
+                  <el-input v-model="formData.payType" style="width: 100%"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+
+              <el-col :span="11">
+                <el-form-item label="备注:" prop="remark">
+                  <el-input v-model="formData.remark" style="width: 100%"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
       </el-card>
 
+
       <el-card>
         <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border
                   highlight-current-row max-height="300" height="300" ref="multipleTable">
@@ -144,28 +236,28 @@
       </el-card>
     </el-form>
 
-    <el-dialog
-      title="产品录入"
-      :visible.sync="selectProductVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      width="80%"
-      v-if="selectProductVisible"
-      :append-to-body='true'
-    >
-      <selectProduct
-        :closeDialog="closeDialogC2"
-        :data="thisData"
-        :purType="1"
-      ></selectProduct>
-    </el-dialog>
+<!--    <el-dialog-->
+<!--      title="产品录入"-->
+<!--      :visible.sync="selectProductVisible"-->
+<!--      :close-on-click-modal="false"-->
+<!--      :close-on-press-escape="false"-->
+<!--      width="80%"-->
+<!--      v-if="selectProductVisible"-->
+<!--      :append-to-body='true'-->
+<!--    >-->
+<!--      <selectProduct-->
+<!--        :closeDialog="closeDialogC2"-->
+<!--        :data="thisData"-->
+<!--        :purType="1"-->
+<!--      ></selectProduct>-->
+<!--    </el-dialog>-->
   </div>
 </template>
 
 <script>
 import draggable from "vuedraggable";
 import {auditOrder, delApplyDetail, listApplyDetail} from "@/api/purchase/purContract";
-// import selectProduct from "@/views/components/selectProduct.vue";
+import {findInvByUser} from "@/api/system/invSubWarehouse";
 
 export default {
   name: "idQuery",
@@ -197,7 +289,8 @@ export default {
       },
       formData: {
         id: null,
-        billNo: null,
+        code: null,
+        name: null,
         createTime: "",
         remark: "",
         deptCode: null,
@@ -246,15 +339,48 @@ export default {
     };
   },
   components: {
-    draggable, selectProduct
+    draggable
   },
   methods: {
+    findSubInvs()
+    {
+      this.subInvList = [];
+      let query = {
+        filter: 3,
+        code : this.formData.invCode
+      };
+      findInvByUser(query)
+        .then((response) => {
+          this.subInvList = response.data || [];
+          if (this.subInvList != null && this.subInvList.length == 1) {
+            this.formData.invCode = this.subInvList[0].code;
+            this.formData.deptCode = this.subInvList[0].parentId;
+          }
+        })
+        .catch(() => {
+        });
+    }
+    ,
+    getInvList()
+    {
+      this.invCodeList = [];
+      let query = {
+        filter: 3
+      };
+      findInvByUser(query)
+        .then((response) => {
+          this.invCodeList = response.data || [];
+        })
+        .catch(() => {
+        });
+    }
+    ,
     saveOrder(status) {
       let tip = "";
       if (status == "3") {
-        tip = "是否确定通过该采购计划？";
+        tip = "是否确定通过该采购合同？";
       } else {
-        tip = "是否确定拒绝该采购计划？";
+        tip = "是否确定拒绝该采购合同？";
       }
       this.$confirm(tip, "提示", {
         confirmButtonText: "确定",
@@ -267,23 +393,17 @@ export default {
       });
     },
     submitFunction(status) {
-      let tMessage = status === '1' ? '保存' : '提交';
       this.loading = true;
       this.formData.pageType = this.pageType
       let tQuery = {
-        autoPurchase: this.formData.autoPurchase,
-        targetSubInv: this.formData.targetSubInv,
-        targetDeptCode: this.formData.targetDeptCode,
-        targetBillAction: this.formData.targetBillAction,
-        editStatus: status,
-        purPlanEntity: this.formData,
-        subErpOrders: this.codeArray,
+        status:status,
+        code:this.formData.code
       }
       auditOrder(tQuery)
         .then(response => {
           this.loading = false;
           if (response.code === 20000) {
-            this.$message.success(tMessage + "成功");
+            this.$message.success("审批成功");
             this.closeDialog(true);
           } else {
             this.$message.error(response.message);
@@ -372,9 +492,9 @@ export default {
     },
     getStockOrderDetailList() {
       this.loading = true;
+      this.query.orderIdFk=this.idQuery.id
       listApplyDetail(this.query) //查找该单号下的所有条码
         .then((response) => {
-          console.log(response)
           this.codeArray = response.data.list || [];
           this.total = response.data.total || 0;
           this.loading = false;
@@ -385,8 +505,6 @@ export default {
           this.total = 0;
         });
     },
-
-
   },
   filters: {},
   mounted() {
@@ -396,33 +514,10 @@ export default {
     };
   },
   created() {
-    if (this.$isNotBlank(this.idQuery.id)) {
-      this.query.limit = 100;
-      this.query.orderIdFk = this.idQuery.id;
-      this.formData = this.idQuery.formData;
-      this.formData.targetInv = 1000;
-      this.orderEditor = true;
-      this.sValue = this.formData.corpName;
-      this.getStockOrderDetailList();
-    } else {
-      this.formData = {
-        id: null,
-        billNo: null,
-        createTime: "",
-        remark: "",
-        deptCode: null,
-        locStorageCode: null,
-        invWarehouseCode: null,
-        auditRemark: null,
-        autoPurchase: false,
-        targetInv: 1000,
-        targetSubInv: null,
-        targetBillAction: null,
-      };
-      this.orderEditor = false;
-    }
-    this.findTargetSubInvs();
-    this.codeArray = [];
+    this.formData = this.idQuery
+    this.findSubInvs();
+    this.getInvList();
+    this.getStockOrderDetailList();
   },
 };
 </script>
diff --git a/src/views/purchase/purContract/purContractFinish.vue b/src/views/purchase/purContract/purContractFinish.vue
index 4ff90933..af51ccd5 100644
--- a/src/views/purchase/purContract/purContractFinish.vue
+++ b/src/views/purchase/purContract/purContractFinish.vue
@@ -65,13 +65,15 @@
         <el-table-column label="往来单位/供应商" prop="fromCorp"></el-table-column>
         <el-table-column label="合同仓库" prop="invCode" :formatter="invCodeFormat"></el-table-column>
 
-<!--        <el-table-column label="合同状态" prop="status" :formatter="statusFormat"></el-table-column>-->
-        <el-table-column label="合同状态" prop="status" width="230">
-          <template slot-scope="scope">
-            <el-tag :type="(scope.row.status) | statusFilterType">
-              {{ statusMap[scope.row.status] }}
+        <el-table-column label="合同状态" prop="status" >
+          <template slot-scope="scope" >
+            <el-tag :type="(scope.row.status == 0? 1:scope.row.status ) | statusFilterType" v-if="scope.row.approvalFlowId == null" >
+              {{ statusMap[(scope.row.status == 0? 1:scope.row.status ) ] }}
+            </el-tag>
+            <el-tag :type="(scope.row.flowStatus == 0? 1:scope.row.flowStatus ) | statusFilterType" v-if="scope.row.approvalFlowId != null">
+              {{ statusMap[(scope.row.flowStatus == 0? 1:scope.row.flowStatus ) ] }}
             </el-tag>
-            <el-tag v-if="scope.row.nextNodeName !=  null && scope.row.nextNodeName != '' && scope.row.status == 2 " class="tag-right-align">
+            <el-tag v-if="scope.row.nextNodeName !=  null && scope.row.nextNodeName != '' && scope.row.flowStatus == 2 && scope.row.approvalFlowId != null" class="tag-right-align">
               <b v-if="scope.row.nextApprovalNodeType == 1">待人员</b>
               <b v-if="scope.row.nextApprovalNodeType == 2">待岗位</b>
               【{{ scope.row.nextNodeName }}】审核
@@ -94,7 +96,7 @@
             <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" v-show="(scope.row.status=='' || scope.row.status==1) " >删除</el-button>
 
             <el-button type="text" size="small" @click.native.stop="showApprovalFlowDetail(scope.row)"
-                       v-show=" scope.row.status != 1 && scope.row.status !=''  ">审批详情
+                       v-show=" scope.row.status != 1 && scope.row.status !='' && scope.row.approvalFlowId != null  ">审批详情
             </el-button>
 
           </template>
diff --git a/src/views/purchase/purContract/purContractReviewed.vue b/src/views/purchase/purContract/purContractReviewed.vue
index e0f90a3f..c06e0b3e 100644
--- a/src/views/purchase/purContract/purContractReviewed.vue
+++ b/src/views/purchase/purContract/purContractReviewed.vue
@@ -65,13 +65,15 @@
         <el-table-column label="往来单位/供应商" prop="fromCorp"></el-table-column>
         <el-table-column label="合同仓库" prop="invCode" :formatter="invCodeFormat"></el-table-column>
 
-<!--        <el-table-column label="合同状态" prop="status" :formatter="statusFormat"></el-table-column>-->
-        <el-table-column label="合同状态" prop="status" width="230">
-          <template slot-scope="scope">
-            <el-tag :type="(scope.row.status) | statusFilterType">
-              {{ statusMap[scope.row.status] }}
+        <el-table-column label="合同状态" prop="status" width="260">
+          <template slot-scope="scope" >
+            <el-tag :type="(scope.row.status == 0? 1:scope.row.status ) | statusFilterType" v-if="scope.row.approvalFlowId == null" >
+              {{ statusMap[(scope.row.status == 0? 1:scope.row.status ) ] }}
+            </el-tag>
+            <el-tag :type="(scope.row.flowStatus == 0? 1:scope.row.flowStatus ) | statusFilterType" v-if="scope.row.approvalFlowId != null">
+              {{ statusMap[(scope.row.flowStatus == 0? 1:scope.row.flowStatus ) ] }}
             </el-tag>
-            <el-tag v-if="scope.row.nextNodeName !=  null && scope.row.nextNodeName != '' && scope.row.status == 2 " class="tag-right-align">
+            <el-tag v-if="scope.row.nextNodeName !=  null && scope.row.nextNodeName != '' && scope.row.flowStatus == 2 && scope.row.approvalFlowId != null" class="tag-right-align">
               <b v-if="scope.row.nextApprovalNodeType == 1">待人员</b>
               <b v-if="scope.row.nextApprovalNodeType == 2">待岗位</b>
               【{{ scope.row.nextNodeName }}】审核
@@ -83,8 +85,7 @@
 <!--        <el-table-column label="付款方式" prop="payType" :formatter="payTypeFormat"></el-table-column>-->
         <el-table-column label="付款方式" prop="payType"></el-table-column>
 
-        <el-table-column label="合同签订日期" prop="contractDate"
-                         sortable="custom" :sort-orders="['ascending', 'descending']"></el-table-column>
+        <el-table-column label="合同签订日期" prop="contractDate" ></el-table-column>
         <el-table-column label="备注" prop="remark"></el-table-column>
 
         <el-table-column label="操作" width="120">
@@ -94,7 +95,11 @@
             <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)" v-show="(scope.row.status=='' || scope.row.status==1) " >删除</el-button>
 
             <el-button type="text" size="small" @click.native.stop="showApprovalFlowDetail(scope.row)"
-                       v-show=" scope.row.status != 1 && scope.row.status !=''  ">审批
+                       v-show=" scope.row.status != 1 && scope.row.status !='' && scope.row.approvalFlowId != null ">审批
+            </el-button>
+
+            <el-button type="text" size="small" @click.native.stop="showDetail(scope.row)"
+                       v-show=" scope.row.status != 1 && scope.row.status !='' && scope.row.approvalFlowId == null ">审批
             </el-button>
 
           </template>
@@ -187,6 +192,23 @@
 
 
 
+    <el-dialog
+      title="审批详情"
+      :visible.sync="purContractDetailDialogVisible"
+      width="65%"
+      v-if="purContractDetailDialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :before-close="handleClose"
+    >
+      <purContractDetailDialog
+        :pageType="pageType"
+        :closeDialog="closeDialog"
+        :idQuery="idQuery"
+        :editType="1"
+      ></purContractDetailDialog>
+    </el-dialog>
+
   </div>
 </template>
 <script>
@@ -194,7 +216,7 @@ import approvalFlowDetail from "@/components/ApprovalFlow";
 import purContractEdit from "@/views/purchase/purContract/purContractEditDialog";
 import purContractSelectPlan from "@/views/purchase/purContract/purContractSelectPlan";
 import {delApply, inserThrOrderWeb, listPlan, listApplyDetail, delContractDetailAll} from "@/api/purchase/purContract";
-// import {filterAllByUser} from "@/api/basic/invWarehouse";
+import purContractDetailDialog from "@/views/purchase/purContract/purContractDetailDialog";
 
 export default {
   name: "purContract",
@@ -277,6 +299,7 @@ export default {
       newSpDistributionVisible: false,
       newDistributionFormPlanVisible: false,
       approvalFlowDetailVisible: false,
+      purContractDetailDialogVisible: false,
       pickerOptions: {
         shortcuts: [
           {
@@ -312,6 +335,10 @@ export default {
   },
 
   methods: {
+    showDetail(row) {
+      this.idQuery = row
+      this.purContractDetailDialogVisible = true;
+    },
     showApprovalFlowDetail(row) {
       this.idQuery.approvalFlowId = row.approvalFlowId
       this.approvalFlowDetailVisible = true;
@@ -387,6 +414,7 @@ export default {
     },
     handleClose() {
       this.approvalFlowDetailVisible = false;
+      this.purContractDetailDialogVisible = false;
       if (this.formName == 'add') {
         this.isChang = !this.isChang
       } else {
@@ -545,6 +573,7 @@ export default {
     closeDialog() {
       this.approvalFlowDetailVisible = false;
       this.newSpDistributionVisible = false;
+      this.purContractDetailDialogVisible = false;
       this.getList();
       this.detailList = [];
     },
@@ -582,7 +611,7 @@ export default {
   }
   ,
   components: {
-    purContractEdit,purContractSelectPlan,approvalFlowDetail
+    purContractEdit,purContractSelectPlan,approvalFlowDetail,purContractDetailDialog
   }
   ,
   filters: {