bug解决

src/components/process/purchase/purchaseDetails.vue

@@ -8,17 +8,17 @@
         <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item label="供应商：" prop="supplierName">
-              <span>{{ form.supplierName }}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="采购单号：" prop="code">
               <span>
-                {{ form.code }}
+                {{ form.supplierName }}
               </span>
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-form-item label="备注：" prop="flowRemark">
+            <span>{{ form.flowRemark }}</span>
+          </el-form-item>
+        </el-row>
       </div>
 
       <div style="margin-bottom: 20px">
@@ -38,7 +38,11 @@
           <el-table-column label="物品名称" prop="goodsName" />
           <el-table-column label="物品单位" prop="goodsUnit" width="80" />
           <el-table-column label="单价" prop="unitPrice" width="100" />
-          <el-table-column label="采购数量" prop="quantity" width="120" />
+          <el-table-column
+            label="采购数量"
+            prop="purchaseQuantity"
+            width="120"
+          />
         </el-table>
       </div>
     </el-form>

src/components/purchase/details.vue

@@ -38,7 +38,22 @@
           <el-table-column label="物品名称" prop="goodsName" />
           <el-table-column label="物品单位" prop="goodsUnit" width="80" />
           <el-table-column label="单价" prop="unitPrice" width="100" />
-          <el-table-column label="采购数量" prop="quantity" width="120" />
+          <el-table-column
+            label="采购数量"
+            prop="purchaseQuantity"
+            width="120"
+          />
+        </el-table>
+      </div>
+      <div style="margin: 20px 0">
+        <labelTitle content="审批记录"></labelTitle>
+      </div>
+      <div style="padding: 0px 20px">
+        <el-table :data="recordsList">
+          <el-table-column label="节点名称" prop="nodeName" />
+          <el-table-column label="节点状态" prop="typeName" />
+          <el-table-column label="发起/审批人" prop="userName" />
+          <el-table-column label="审批说明" prop="remarks" />
         </el-table>
       </div>
     </el-form>
@@ -50,6 +65,8 @@ import labelTitle from "@/components/label-title/index.vue";
 import { purchaseDetails } from "@/api/purchase-management/purchase/index.js";
 import { supplySelect } from "@/api/product-material/supply/index.js";
 
+import { exampleInfo, exampleInfoShowFlow } from "@/api/process";
+
 export default {
   props: {
     rowData: {
@@ -65,6 +82,7 @@ export default {
       form: {},
       supplySelectList: [],
       productTypeList: [],
+      recordsList: [],
     };
   },
   created() {
@@ -78,9 +96,21 @@ export default {
   mounted() {
     if (this.rowData.id) {
       this.getDetails();
+      this.getRecordsList();
     }
   },
   methods: {
+    getRecordsList() {
+      if (this.rowData.flowId) {
+        exampleInfo({ flowLinkNo: this.rowData.id }).then((res) => {
+          this.recordsList = res.data.data;
+        });
+      } else {
+        exampleInfoShowFlow({ code: "PURCHASE" }).then((res) => {
+          this.recordsList = res.data.data;
+        });
+      }
+    },
     async getDetails() {
       this.loading = true;
       const { data } = await supplySelect({ name: "", code: "", type: "" });

src/views/process/examinationApproval/index.vue

@@ -13,6 +13,7 @@
             ref="make"
             v-if="startStatus"
           ></PurchaseMake>
+
           <PurchaseDetails :rowData="transferParams" v-else></PurchaseDetails>
         </el-card>
         <div style="height: 10px"></div>

src/views/purchase-management/deliver-goods/index.vue

@@ -292,6 +292,16 @@ export default {
       this.rowData = { ...row };
       this.detailsDialog = true;
     },
+    // openDetails(row) {
+    //   this.$router.push({
+    //     path: "/process/examinationApproval/index",
+    //     query: {
+    //       id: row.id,
+    //       processInstanceId: row.flowId || "",
+    //       flowCode: "PURCHASE",
+    //     },
+    //   });
+    // },
     handleSubmitBack(data) {
       API.purchaseBack(data).then(
         () => {

src/views/purchase-management/purchase/index.vue

@@ -314,6 +314,7 @@ export default {
           type="selection"
           width="50"
           align="left"
+          fixed="left"
           :selectable="isSelectable"
         >
         </el-table-column>
@@ -324,7 +325,12 @@ export default {
           prop="goodsCode"
           width="130"
         />
-        <el-table-column label="物品名称" align="left" prop="goodsName" />
+        <el-table-column
+          label="物品名称"
+          align="left"
+          prop="goodsName"
+          min-width="150"
+        />
         <el-table-column
           label="物品类型"
           align="left"
@@ -353,7 +359,12 @@ export default {
           "
         />
 
-        <el-table-column label="收货仓库" align="left" prop="warehouseName" />
+        <el-table-column
+          label="收货仓库"
+          align="left"
+          prop="warehouseName"
+          min-width="150"
+        />
 
         <el-table-column
           label="要求到货时间"
@@ -392,7 +403,7 @@ export default {
           "
         />
 
-        <el-table-column label="操作" align="center" width="120">
+        <el-table-column label="操作" align="center" width="120" fixed="right">
           <template slot-scope="scope">
             <el-button
               type="text"