Browse Source

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

lilei 3 years ago
parent
commit
b2bd27b94c

+ 5 - 29
src/views/salesManagement/outboundOrder/list.vue

@@ -10,17 +10,8 @@
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
-            <a-form-item label="客户名称">
-              <a-select
-                id="outboundOrderList-demanderName"
-                placeholder="请选择"
-                allowClear
-                v-model="queryParam.demanderName"
-                :showSearch="true"
-                option-filter-prop="children"
-                :filter-option="filterOption">
-                <a-select-option v-for="item in custAllList" :key="item.customerSn" :value="item.customerName">{{ item.customerName }}</a-select-option>
-              </a-select>
+            <a-form-item label="单位名称">
+              <a-input id="outboundOrderList-demanderName" v-model="queryParam.demanderName" placeholder="请输入单位名称" allowClear />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -109,7 +100,6 @@
 <script>
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
-import { custAllList } from '@/api/customer'
 import { stockOutList, stockOutOut } from '@/api/stockOut'
 export default {
   components: { STable, VSelect, rangeDate },
@@ -120,18 +110,17 @@ export default {
       queryParam: { //  查询条件
         beginDate: '',
         endDate: '',
-        demanderName: undefined, //  客户名称
+        demanderName: undefined, //  单位名称
         outBizType: undefined, //  出库类型
         state: undefined //  状态
       },
       disabled: false, //  查询、重置按钮是否可操作
-      custAllList: [], //  客户下拉数据
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
         { title: '关联单号', dataIndex: 'outBizNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'demanderName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '单位名称', dataIndex: 'demanderName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'productTotalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总售价', dataIndex: 'productTotalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -258,23 +247,10 @@ export default {
     onSelectChange (selectedRowKeys) {
       console.log('selectedRowKeys changed: ', selectedRowKeys)
       this.selectedRowKeys = selectedRowKeys
-    },
-    // 客户无分页列表数据
-    getCustAllList () {
-      const _this = this
-      custAllList().then(res => {
-        if (res.status == 200) {
-          _this.custAllList = res.data || []
-        } else {
-          _this.custAllList = []
-        }
-      })
     }
   },
   beforeRouteEnter (to, from, next) {
-    next(vm => {
-      vm.getCustAllList()
-    })
+    next(vm => {})
   }
 }
 </script>

+ 1 - 1
src/views/salesManagement/salesQuery/chooseCustomModal.vue

@@ -493,7 +493,7 @@ export default {
       this.form.shippingAddressCountySn = undefined
       this.form.shippingAddressCountyName = ''
       this.form.shippingAddress = ''
-      this.form.shippingAddressCountyName = this.addrProvinceList.find(item => item.id == val).name
+      this.form.shippingAddressProvinceName = this.addrProvinceList.find(item => item.id == val).name
       this.getArea('city', val)
     },
     // 获取区县列表