Explorar el Código

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

# Conflicts:
#	public/version.json
lilei hace 2 años
padre
commit
3b72e2b02e

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1675235672863
+  "version": 1675237363823
 }

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

@@ -164,7 +164,8 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import basicInfoModal from './basicInfoModal.vue'
 import stateIcon from '@/views/common/stateIcon'
 import getDate from '@/libs/getDate.js'
-import { purchaseList, purchaseDel, purchaseCount, purchaseTargetList } from '@/api/purchase'
+import { purchaseList, purchaseDel, purchaseCount } from '@/api/purchase'
+import { queryReturnSupplierList } from '@/api/purchaseReturn'
 export default {
   name: 'PurchaseList',
   components: { STable, VSelect, basicInfoModal, rangeDate, stateIcon },
@@ -328,7 +329,7 @@ export default {
     },
     // 获取供应商数据
     getSupperList () {
-      purchaseTargetList({}).then(res => {
+      queryReturnSupplierList({}).then(res => {
         if (res.status == 200) {
           this.supplierList = res.data
         } else {

+ 2 - 3
src/views/purchasingManagement/purchaseReturnOutSync/basicInfoModal.vue

@@ -49,8 +49,7 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { VSelect } from '@/components'
-import { purchaseTargetList } from '@/api/purchase'
-import { purchaseReturnSaveByNoSync } from '@/api/purchaseReturn'
+import { purchaseReturnSaveByNoSync, queryReturnSupplierList } from '@/api/purchaseReturn'
 export default {
   name: 'BasicInfoModal',
   components: { VSelect },
@@ -154,7 +153,7 @@ export default {
         params = {}
       }
       console.log(params)
-      purchaseTargetList(params).then(res => {
+      queryReturnSupplierList(params).then(res => {
         if (res.status == 200 && res.data[0]) {
           this.purchaseTragetType = res.data
           this.$emit('load', res.data)

+ 1 - 1
src/views/reportData/urgentItemsOffsetReport/detailList.vue

@@ -190,7 +190,7 @@ export default {
         { title: '冲减时间', dataIndex: 'offSetTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(9, 0, { title: '成本', dataIndex: 'totalCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(8, 0, { title: '成本', dataIndex: 'totalCost', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 5 - 5
src/views/reportData/urgentItemsOffsetReport/list.vue

@@ -33,7 +33,7 @@
               <a-input id="urgentItemsOffsetReport-buyerName" v-model.trim="queryParam.buyerName" allowClear placeholder="请输入客户名称"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="6" :sm="24">
+          <!-- <a-col :md="6" :sm="24">
             <a-form-item label="单据来源">
               <v-select
                 v-model="queryParam.sourceType"
@@ -43,7 +43,7 @@
                 placeholder="请选择单据来源"
                 allowClear></v-select>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="urgentItemsOffsetReport-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="urgentItemsOffsetReport-reset">重置</a-button>
@@ -148,15 +148,15 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '急件单号', dataIndex: 'urgentBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', dataIndex: 'bizBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单据来源', dataIndex: 'sourceTypeDictValue', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'buyerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        // { title: '单据来源', dataIndex: 'sourceTypeDictValue', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'buyerName', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '款数', dataIndex: 'totalCategory', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '数量', dataIndex: 'totalQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '成本', dataIndex: 'totalCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '冲减时间', dataIndex: 'offSetTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(7, 0, { title: '成本', dataIndex: 'totalCost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(6, 0, { title: '成本', dataIndex: 'totalCost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }