财务审核&订单状态

src/views/custom/purchase/index.vue

@@ -951,14 +951,7 @@
                 <span>{{ parseFloat(scope.row.reportery ) }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="申购类型" min-width="80px" align="center">
-              <template slot-scope="scope">
-                <span v-if="scope.row.purchase_type == 1">暂估申购</span>
-                <span v-else-if="scope.row.purchase_type == 3">赠品申购</span>
-                <span v-else-if="scope.row.purchase_type == 4">奶厅申购</span>
-                <span v-else>新增申购</span>
-              </template>
-            </el-table-column>
+
             <el-table-column sortable prop="sumAmount" label="申购数量" min-width="110px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.sumAmount }}</span>
@@ -974,6 +967,14 @@
                 <span>{{ scope.row.receiveAmount }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="申购类型" min-width="80px" align="center">
+              <template slot-scope="scope">
+                <span v-if="scope.row.purchase_type == 1">暂估申购</span>
+                <span v-else-if="scope.row.purchase_type == 3">赠品申购</span>
+                <span v-else-if="scope.row.purchase_type == 4">奶厅申购</span>
+                <span v-else>新增申购</span>
+              </template>
+            </el-table-column>
             <el-table-column label="申购部门" min-width="110px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.departmentName }}</span>
@@ -3076,14 +3077,21 @@ export default {
             this.isPercentage = false
           }, 2000)
         }
+        const obj = {
+          0: '新增申购',
+          1: '暂估申购',
+          3: '赠品申购',
+          4: '奶厅申购'
+        }
         response.data.list.length && response.data.list.forEach((item) => {
           item.reportery = parseFloat(item.reportery)
+          item.purchase_type = obj[item.purchase_type]
         })
         this.downloadList3 = response.data.list
         const elecExcelDatas = [
           {
-            tHeader: ['配单号', '采购单号', '备件编号', '备件名称', '备件规格', '备件品牌', '计量单位', '供应商', '单价', '当前库存', '申购类型', '申购数量', '采购数量', '入库数', '申购部门', '采购人', '配单日期'],
-            filterVal: ['matchCode', 'buyeCode', 'partCode', 'partName', 'specification', 'brand', 'unit', 'providerName', 'price', 'reportery', 'purchase_type', 'sumAmount', 'amount', 'receiveAmount', 'departmentName', 'empname', 'buyerDate'],
+            tHeader: ['配单号', '采购单号', '备件编号', '备件名称', '备件规格', '备件品牌', '计量单位', '供应商', '单价', '当前库存', '申购数量', '采购数量', '入库数', '申购类型', '申购部门', '采购人', '配单日期'],
+            filterVal: ['matchCode', 'buyeCode', 'partCode', 'partName', 'specification', 'brand', 'unit', 'providerName', 'price', 'reportery', 'sumAmount', 'amount', 'receiveAmount', 'purchase_type', 'departmentName', 'empname', 'buyerDate'],
             tableDatas: this.downloadList3,
             sheetName: '采购明细'
           }

src/views/custom/subscribe/index.vue

@@ -332,7 +332,7 @@
           <!-- 财务 -->
           <el-button
             v-if="
-              isSubscribeExamineCW && row.purchase_type > 0 && row.statue == 7
+              isSubscribeExamineCW && row.purchase_type == 1 && row.statue == 7
             "
             style="display: inline-block"
             type="success"
@@ -1637,7 +1637,7 @@
                 <el-button
                   v-if="
                     isSubscribeExamineCW &&
-                      seeTemp.purchase_type > 0 &&
+                      seeTemp.purchase_type == 1 &&
                       seeTemp.statue == 7
                   "
                   style="display: inline-block"
@@ -2476,7 +2476,7 @@
                 <el-button
                   v-if="
                     isSubscribeExamineCW &&
-                      seeTemp.purchase_type > 0 &&
+                      seeTemp.purchase_type == 1 &&
                       seeTemp.statue == 7
                   "
                   style="display: inline-block"
@@ -3050,7 +3050,8 @@ export default {
           cellValue.statue == 5 ||
           cellValue.statue == 7 ||
           cellValue.statue == 9 ||
-          cellValue.statue == 11
+          cellValue.statue == 11 ||
+          cellValue.statue == 15
         ) {
           return '审核中'
         } else if (cellValue.statue == 13) {
@@ -3067,9 +3068,8 @@ export default {
           cellValue.statue == 3 ||
           cellValue.statue == 5 ||
           cellValue.statue == 9 ||
-          cellValue.statue == 11 ||
-          cellValue.statue == 13 ||
-          cellValue.statue == 15
+          cellValue.statue == 15 ||
+          cellValue.statue == 11
         ) {
           return '审核中'
         } else if (cellValue.statue == 7) {