chenrui hai 6 meses
pai
achega
45073b5888

+ 0 - 1
src/views/power/dataDictionary/dataDictionary.vue

@@ -335,7 +335,6 @@ export default {
           delLookUpItem({
             id: row.id
           }).then(res => {
-            console.log(res, 'res1111')
             if (res.status == 200) {
               _this.$message.success('删除成功')
               _this.$refs.table.refresh()

+ 2 - 2
src/views/salesManagement/salesQueryNew/auditModal.vue

@@ -20,7 +20,7 @@
         <a-form-model-item label="发货经销商">
           {{ detailData&&detailData.transferDealerName||'--' }}
         </a-form-model-item>
-        <div style="margin-top:20px;">由于{{ detailData&&detailData.transferDealerName }}非{{ detailData&&detailData.buyerName }}的轮胎上级或省仓,需上级审核通过后完成转单。</div>
+        <div style="margin:20px auto;width:80%;">由于<strong style="color:#ed1c24;">{{ detailData&&detailData.transferDealerName }}</strong><strong style="color:#ed1c24;">{{ detailData&&detailData.buyerName }}</strong>的轮胎上级或省仓,需上级审核通过后完成转单。</div>
       </a-form-model>
       <div class="btn-cont">
         <a-button id="audit-modal-back" @click="handleSave('0')">审核不通过</a-button>
@@ -89,7 +89,7 @@ export default {
     }
     .btn-cont {
       text-align: center;
-      margin: 35px 0 10px;
+      margin: 40px 0 10px;
     }
   }
 </style>

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/dealerStockModal.vue

@@ -78,7 +78,7 @@ export default {
     dealerChange (val) {
       if (val && val.key) {
         this.selectDealerSn = val.key
-        this.selectDealerName = val.key
+        this.selectDealerName = val.name
       }
     },
     //  保存

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -262,7 +262,7 @@ export default {
           arr.push({ title: '第三方库存', field: 'thirdStockQty', width: 80, key: 'mm', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field]) } })
         }
       }
-      if (this.detailData && this.detailData.salesBillSource == 'PURCHASE' && this.detailData.orderType == 'TIRE') {
+      if (this.detailData && this.detailData.billStatus && (this.detailData.billStatus == 'TRANSFER_YES' || this.detailData.billStatus == 'TRANSFER_AUDIT_REJECT' || this.detailData.billStatus == 'TRANSFER_FINISH')) {
         arr.push({ title: '发货经销商库存', field: 'transferDealerStockQty', width: 100, key: 'tt', align: 'center', operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return transferDealerInfo(row, row[column.field], h) } })
         this.colspanNums = this.colspanNums + 1
       }

+ 2 - 2
src/views/salesManagement/salesQueryNew/detail.vue

@@ -490,10 +490,10 @@ export default {
       }
       transferVerify({ salesBillSn: _this.$route.params.sn, transferDealerSn: _this.selectedDealerSn }).then(res => {
         if (res.status == 200) {
-          if (res.data && res.data.length) {
+          if (res.data && Object.keys(res.data).length) {
             _this.$confirm({
               title: '提示',
-              content: res.data,
+              content: <div><strong style="color:#ed1c24;">{res.data.dealerName}</strong>非<strong style="color:#ed1c24;">{res.data.buyerName}</strong>的轮胎上级或省仓,提交后待上级审核通过完成转单</div>,
               centered: true,
               closable: true,
               okText: '提交',