Просмотр исходного кода

Merge branch 'develop_lcgz' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_lcgz

lilei 3 лет назад
Родитель
Сommit
7a82c3a69c

+ 1 - 0
src/config/router.config.js

@@ -422,6 +422,7 @@ export const asyncRouterMap = [
                 meta: {
                   title: '签收入库',
                   icon: 'money-collect',
+                  replaceTab: true,
                   hidden: true
                   // permission: 'B_signWarehousingDetail'
                 }

+ 1 - 1
src/utils/request.js

@@ -13,7 +13,7 @@ const service = axios.create({
 })
 
 const err = (error) => {
-  console.log(error.response.data.message, 'error')
+  console.log(error, 'error')
   if (error.response) {
     const status = error.response.status
     if ((status == 503 || status == 500) && window.location.pathname != '/user/login') {

+ 5 - 2
src/views/inventoryManagement/inventoryChecking/detailModal.vue

@@ -232,13 +232,16 @@ export default {
         { title: '单位', dataIndex: 'productUnit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '库存数量', dataIndex: 'stockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '盘点数量', dataIndex: 'checkQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '盈亏数量', scopedSlots: { customRender: 'checkProfitLossQty' }, width: '6%', align: 'center' },
-        { title: '盈亏成本', scopedSlots: { customRender: 'checkProfitLossCost' }, width: '6%', align: 'right' }
+        { title: '盈亏数量', scopedSlots: { customRender: 'checkProfitLossQty' }, width: '6%', align: 'center' }
+        // { title: '盈亏成本', scopedSlots: { customRender: 'checkProfitLossCost' }, width: '6%', align: 'right' }
       ]
       if (this.basicInfoData && this.basicInfoData.warehouseFlag == '1') {
         arr.splice(4, 0, { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
         arr.splice(5, 0, { title: '仓位', dataIndex: 'warehouseLocationName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true })
       }
+      if (this.basicInfoData && this.basicInfoData.state == 'FINISH') {
+        arr.push({ title: '盈亏成本', scopedSlots: { customRender: 'checkProfitLossCost' }, width: '6%', align: 'right' })
+      }
       return arr
     }
   },

+ 9 - 8
src/views/purchasingManagement/purchaseOrder/detail.vue

@@ -8,13 +8,14 @@
           <span class="billno">单号:{{ detail&&detail.purchaseBillNo }}</span>
           <a-tag color="blue">{{ detail&&detail.billStatusDictValue }}</a-tag>
           <a-tag color="orange">{{ detail&&detail.financialStatusDictValue }}</a-tag>
+          <span class="billno" v-if="detail&&detail.purchaseBillNoSource" style="font-size: 14px;margin: 0;">(原:{{ detail&&detail.purchaseBillNoSource }})</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
           <Print v-if="$hasPermissions('B_purchasePrint')" :disabled="localDataSource.length==0" @handlePrint="handlePrint"></Print>
           <a-button
             key="1"
-            v-if="$hasPermissions('B_purchaseExportProduct') && (detail&&(detail.billStatus=='WAIT_PUT_WAREHOUSE' || detail.billStatus=='WAIT_PUT_WAREHOUSE_AUDIT' || detail.billStatus=='FINISH'))"
+            v-if="$hasPermissions('B_purchaseExportProduct') && (detail&&(detail.billStatus=='AUDIT_PASS' || detail.billStatus=='CANCEL' || detail.billStatus=='WAIT_PUT_WAREHOUSE' || detail.billStatus=='WAIT_PUT_WAREHOUSE_AUDIT' || detail.billStatus=='FINISH'))"
             type="primary"
             class="button-info"
             id="purchaseOrderDetail-export-btn"
@@ -54,11 +55,11 @@
               <div slot="message">
                 产品款数:<strong>{{ detail && (detail.totalCategory || detail.totalCategory==0) ? detail.totalCategory : '--' }}</strong>,
                 采购数量合计:<strong>{{ detail && (detail.totalQty || detail.totalQty==0) ? detail.totalQty : '--' }}</strong>,
-                审核订单数量:<strong>{{ detail && (detail.totalAuthQty || detail.totalAuthQty==0) ? detail.totalAuthQty : '--' }}</strong>,
-                缺货数量:<strong>{{ detail && (detail.totalCancelQty || detail.totalCancelQty==0) ? detail.totalCancelQty : '--' }}</strong>,
+                审核订单数量:<strong>{{ detail && (detail.totalPushedQty || detail.totalPushedQty==0) ? detail.totalPushedQty : '--' }}</strong>,
+                已取消数量:<strong>{{ detail && (detail.totalCancelQty || detail.totalCancelQty==0) ? detail.totalCancelQty : '--' }}</strong>,
                 采购金额合计:<strong>{{ detail && (detail.discountedAmount || detail.discountedAmount==0) ? '¥'+detail.discountedAmount : '--' }}</strong>,
-                审核订单金额:<strong>{{ detail && (detail.totalAuthAmount || detail.totalAuthAmount==0) ? '¥'+detail.totalAuthAmount : '--' }}</strong>,
-                缺货金额:<strong>{{ detail && (detail.totalCancelAmount || detail.totalCancelAmount==0) ? '¥'+detail.totalCancelAmount : '--' }}</strong>
+                审核订单金额:<strong>{{ detail && (detail.totalPushedAmount || detail.totalPushedAmount==0) ? '¥'+detail.totalPushedAmount : '--' }}</strong>,
+                已取消金额:<strong>{{ detail && (detail.totalCancelAmount || detail.totalCancelAmount==0) ? '¥'+detail.totalCancelAmount : '--' }}</strong>
               </div>
             </a-alert>
             <!-- 列表 -->
@@ -76,7 +77,7 @@
                 <div>{{ text }}</div>
                 <div v-if="record.origqty">原采购数量:{{ record.origqty }}</div>
               </template>
-              <!-- 缺货数量 -->
+              <!-- 已取消数量 -->
               <template slot="outOfStockNum" slot-scope="text, record">
                 <span>{{ record.outOfStockNum }}</span>
               </template>
@@ -109,7 +110,7 @@
                 <div>{{ text }}</div>
                 <div v-if="record.origqty">原采购数量:{{ record.origqty }}</div>
               </template>
-              <!-- 缺货数量 -->
+              <!-- 已取消数量 -->
               <template slot="outOfStockNum" slot-scope="text, record">
                 <span>{{ record.outOfStockNum }}</span>
               </template>
@@ -161,7 +162,7 @@ export default {
         { title: '采购数量', dataIndex: 'qty', width: '7%', align: 'center', scopedSlots: { customRender: 'origqty' } },
         { title: '审核订单金额', dataIndex: 'pushedAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '审核订单数量', dataIndex: 'pushedQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '缺货数量', dataIndex: 'cancelQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '已取消数量', dataIndex: 'cancelQty', width: '7%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 2 - 2
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -188,13 +188,13 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '采购单号', scopedSlots: { customRender: 'purchaseBillNo' }, width: '14%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '供应商', dataIndex: 'purchaseTargetName', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '供应商', dataIndex: 'purchaseTargetName', width: '13%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品款数', dataIndex: 'totalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '采购数量', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '采购金额', dataIndex: 'discountedAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '审核数量', dataIndex: 'totalPushedQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '审核金额', dataIndex: 'totalPushedAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '缺货数量', dataIndex: 'totalCancelQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '已取消数量', dataIndex: 'totalCancelQty', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '9%', align: 'center' }

+ 6 - 7
src/views/purchasingManagement/signWarehousing/list.vue

@@ -58,14 +58,13 @@
         bordered>
         <!-- 单号 -->
         <template slot="purchaseBillNo" slot-scope="text, record">
-          <!-- <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_purchaseReturnDetail')" @click="handleDetail(record)">{{ record.purchaseBillNo || '--' }}</span> -->
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.purchaseBillNo || '--' }}</span>
-          <!-- <span v-else>{{ record.purchaseBillNo || '--' }}</span> -->
+          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_purchaseDetail')" @click="handleDetail(record)">{{ record.purchaseBillNo || '--' }}</span>
+          <span v-else>{{ record.purchaseBillNo || '--' }}</span>
         </template>
         <!-- 单号 -->
         <template slot="sendBillNo" slot-scope="text, record">
-          <span style="color: #ed1c24;cursor: pointer;" @click="handleStockDetail(record)">{{ record.sendBillNo || '--' }}</span>
-          <!-- <span v-else>{{ record.sendBillNo || '--' }}</span> -->
+          <span style="color: #ed1c24;cursor: pointer;" v-if="$hasPermissions('B_signWarehousingDetail')" @click="handleStockDetail(record)">{{ record.sendBillNo || '--' }}</span>
+          <span v-else>{{ record.sendBillNo || '--' }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
@@ -73,10 +72,10 @@
             size="small"
             type="link"
             class="button-warning"
-            v-if="(record.auditState == 'PUT_WAREHOUSE_AUDIT_REJECT' || record.auditState == 'WAIT_PUT_WAREHOUSE')&&$hasPermissions('B_purchaseReceiving')"
+            v-if="(record.auditState == 'PUT_WAREHOUSE_AUDIT_REJECT' || record.auditState == 'WAIT_PUT_WAREHOUSE')&&$hasPermissions('B_signWarehousingSign')"
             @click="handleWarehouse(record)"
           >签收入库</a-button>
-          <span v-if="!((record.auditState == 'PUT_WAREHOUSE_AUDIT_REJECT' || record.auditState == 'WAIT_PUT_WAREHOUSE')&&$hasPermissions('B_purchaseReceiving'))">--</span>
+          <span v-if="!((record.auditState == 'PUT_WAREHOUSE_AUDIT_REJECT' || record.auditState == 'WAIT_PUT_WAREHOUSE')&&$hasPermissions('B_signWarehousingSign'))">--</span>
         </template>
       </s-table>
     </a-spin>

+ 1 - 1
src/views/purchasingManagement/signWarehousing/stockOrderDetail.vue

@@ -17,6 +17,7 @@
             key="1"
             type="primary"
             class="button-warning"
+            v-if="$hasPermissions('B_signWarehousingExport')"
             id="signWarehousingDetail-export-btn"
             :disabled="localDataSource.length==0"
             @click="handleExportProduct()">导出Excel</a-button>
@@ -66,7 +67,6 @@
           <!-- 采购数量 -->
           <template slot="qty" slot-scope="text, record">
             <div>{{ record.qty }}</div>
-            <!-- <div v-if="record.qty">原采购数量:{{ record.qty }}</div> -->
           </template>
           <!-- 缺货数量 -->
           <template slot="outOfStockNum" slot-scope="text, record">