lilei 2 gadi atpakaļ
vecāks
revīzija
982a1f9867

+ 3 - 3
src/views/allocationManagement/transferOut/printModal.vue

@@ -29,7 +29,7 @@
             </a-select-option>
           </a-select>
         </a-form-model-item>
-        <a-form-model-item label="货编号" prop="orderBy" v-if="nowType=='dbflPrint'">
+        <a-form-model-item label="货编号" prop="orderBy" v-if="nowType=='dbflPrint'">
           <a-radio-group v-model="form.orderBy">
             <a-radio value="ASC">打印(↑升序)</a-radio>
             <a-radio value="DESC">打印(↓降序)</a-radio>
@@ -100,7 +100,7 @@ export default {
       rules: {
         id: [{ required: true, message: '请选择产品分类', trigger: 'change' }],
         priceType: [{ required: true, message: '请选择产品价格', trigger: 'change' }],
-        orderBy: [{ required: true, message: '请选择货编号', trigger: 'change' }]
+        orderBy: [{ required: true, message: '请选择货编号', trigger: 'change' }]
       },
       formItemLayout: {
         labelCol: { span: 6 },
@@ -149,7 +149,7 @@ export default {
               obj.productTypeSn3 = item.productTypeSn3
               obj.printType = 'ALLOCATE_BILL_TYPE'
             }
-            // 打印货编号
+            // 打印货编号
             if (_this.nowType == 'dbflPrint') {
               if (_this.form.orderBy != '-1') {
                 obj.orderBy = _this.form.orderBy

+ 1 - 1
src/views/allocationManagement/transferReturn/print.vue

@@ -73,7 +73,7 @@ export default {
         allocateReturnSn: obj.allocateReturnSn || '',
         printType: obj.printType
       }
-      // 打印货编号
+      // 打印货编号
       if (obj.orderBy) {
         params.orderBy = obj.orderBy
       }

+ 2 - 2
src/views/allocationManagement/transferReturn/printModal.vue

@@ -26,7 +26,7 @@
             <a-radio value="bdy">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
-        <a-form-model-item label="货编号" prop="orderBy">
+        <a-form-model-item label="货编号" prop="orderBy">
           <a-radio-group v-model="form.orderBy">
             <a-radio value="ASC">打印(↑升序)</a-radio>
             <a-radio value="DESC">打印(↓降序)</a-radio>
@@ -70,7 +70,7 @@ export default {
       },
       rules: {
         priceType: [{ required: true, message: '请选择产品价格', trigger: 'change' }],
-        orderBy: [{ required: true, message: '请选择货编号', trigger: 'change' }]
+        orderBy: [{ required: true, message: '请选择货编号', trigger: 'change' }]
       },
       formItemLayout: {
         labelCol: { span: 6 },

+ 2 - 2
src/views/financialManagement/financialCollection/edit.vue

@@ -171,7 +171,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '收款日期', dataIndex: 'receiptDate', align: 'center', width: '6%', customRender: function (text) { return text || '--' } },
         { title: '付款方类型', dataIndex: 'payerTypeDictValue', align: 'center', width: '6%', customRender: function (text) { return text || '--' } },
-        { title: '付款方', dataIndex: 'payerName', align: 'center', width: '7%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '付款方', dataIndex: 'payerName', align: 'center', width: '7%', customRender: function (text) { return text || '--' } },
         { title: '财务编码', dataIndex: 'dealerEntity.kdMidCustomerFnumber', align: 'center', width: '6%', customRender: function (text) { return text || '--' } },
         { title: '付款账户(营业执照)', scopedSlots: { customRender: 'payerAccountInfo' }, align: 'center', width: '7%' },
         { title: '订单金额', dataIndex: 'orderAmount', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
@@ -183,7 +183,7 @@ export default {
         { title: '户名', dataIndex: 'bankAccount', align: 'center', width: '7%', customRender: function (text) { return text || '--' } },
         { title: '汇入银行', dataIndex: 'bankName', align: 'center', width: '7%', customRender: function (text) { return text || '--' } },
         { title: '足额打款', dataIndex: 'fullPaymentFlagDictValue', align: 'center', width: '5%', customRender: function (text) { return (text == 0 || text) ? text : '--' } },
-        { title: '备注', dataIndex: 'remarks', align: 'center', width: '6%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '备注', dataIndex: 'remarks', align: 'center', width: '6%', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ],
       useCol: [

+ 2 - 0
src/views/financialManagement/financialCollection/fcDetailModal.vue

@@ -310,6 +310,7 @@ export default {
       console.log(v)
       if (v && v.key) {
         this.form.dealerSn = v.key
+        this.form.payerName = v.name
         this.form.dealerCode = v.row ? v.row.kdMidCustomerFnumber : ''
         this.form.licenseName = v.row ? v.row.licenseName : ''
 
@@ -326,6 +327,7 @@ export default {
         })
       } else {
         this.form.dealerSn = ''
+        this.form.payerName = ''
         this.form.dealerCode = ''
         this.form.licenseName = ''
         this.form.payerAccountInfo = ''

+ 2 - 2
src/views/inventoryManagement/makeInventory/printModal.vue

@@ -19,7 +19,7 @@
       >
         <a-form-model-item label="盘点单号">{{ itemData&&itemData.checkWarehouseNo || '--' }}</a-form-model-item>
         <a-form-model-item label="打印范围">{{ itemData&&itemData.printContent || '--' }}</a-form-model-item>
-        <a-form-model-item label="货编号" prop="orderBy">
+        <a-form-model-item label="货编号" prop="orderBy">
           <a-radio-group v-model="form.orderBy">
             <a-radio value="ASC">打印(↑升序)</a-radio>
             <a-radio value="DESC">打印(↓降序)</a-radio>
@@ -61,7 +61,7 @@ export default {
         orderBy: undefined
       },
       rules: {
-        orderBy: [{ required: true, message: '请选择货编号', trigger: 'change' }]
+        orderBy: [{ required: true, message: '请选择货编号', trigger: 'change' }]
       },
       formItemLayout: {
         labelCol: { span: 6 },

+ 1 - 1
src/views/productManagement/shelfNoManage/editHwModal.vue

@@ -19,7 +19,7 @@
         <a-form-model-item label="产品编码">{{ nowData&&nowData.productVO.code || '--' }}</a-form-model-item>
         <a-form-model-item label="产品名称">{{ nowData&&nowData.productVO.name || '--' }}</a-form-model-item>
         <a-form-model-item label="货位编号" prop="stackPlaceCode">
-          <a-input v-model="form.stackPlaceCode" :maxlength="10" placeholder="请输入货位编号(最多10个字符)"></a-input>
+          <a-input v-model="form.stackPlaceCode" :maxLength="10" placeholder="请输入货位编号(最多10个字符)"></a-input>
           <div style="color:#fba200;font-size:12px;">货位编号允许为空,为空则表示此产品没有货位编号</div>
         </a-form-model-item>
       </a-form-model>

+ 1 - 1
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -268,7 +268,7 @@ export default {
       if (type != 'export') {
         _this.spinning = true
 
-        // 货编号
+        // 货编号
         if (obj.orderBy) {
           params.type = params.type + '_STACK_PLACE'
         }

+ 3 - 3
src/views/salesManagement/pushOrderManagement/sendTypeModal.vue

@@ -40,7 +40,7 @@
             </a-select-option>
           </a-select>
         </a-form-model-item>
-        <a-form-model-item label="货编号" prop="orderBy" v-if="nowType=='print'">
+        <a-form-model-item label="货编号" prop="orderBy" v-if="nowType=='print'">
           <a-radio-group v-model="form.orderBy">
             <a-radio value="sbd.STACK_PLACE_CODE ASC">打印(↑升序)</a-radio>
             <a-radio value="sbd.STACK_PLACE_CODE DESC">打印(↓降序)</a-radio>
@@ -104,7 +104,7 @@ export default {
       },
       rules: {
         id: [{ required: true, message: '请选择产品分类', trigger: 'change' }],
-        orderBy: [{ required: true, message: '请选择货编号', trigger: 'change' }]
+        orderBy: [{ required: true, message: '请选择货编号', trigger: 'change' }]
       },
       formItemLayout: {
         labelCol: { span: 6 },
@@ -129,7 +129,7 @@ export default {
               dispatchBillSn: this.detailData.dispatchBillSn,
               dispatchBillNo: this.detailData.dispatchBillNo
             }
-            // 打印货编号
+            // 打印货编号
             if (_this.form.orderBy != '-1') {
               obj.orderBy = _this.form.orderBy
             }

+ 3 - 3
src/views/salesManagement/salesQuery/printModal.vue

@@ -51,7 +51,7 @@
             <a-radio :value="form.dataScope == 'ENOUGH' ? 'SALES_BILL_NOT_LACK':'SALES_BILL'">不导出</a-radio>
           </a-radio-group>
         </a-form-model-item>
-        <a-form-model-item label="货编号" prop="orderBy" v-if="nowType=='SALES_BILL_TYPE'">
+        <a-form-model-item label="货编号" prop="orderBy" v-if="nowType=='SALES_BILL_TYPE'">
           <a-radio-group v-model="form.orderBy">
             <a-radio value="sbd.STACK_PLACE_CODE ASC">打印(↑升序)</a-radio>
             <a-radio value="sbd.STACK_PLACE_CODE DESC">打印(↓降序)</a-radio>
@@ -99,7 +99,7 @@ export default {
         id: [{ required: true, message: '请选择产品分类', trigger: 'change' }],
         dataScope: [{ required: true, message: '请选择是否缺货产品', trigger: 'change' }],
         priceType: [{ required: true, message: '请选择产品售价', trigger: 'change' }],
-        orderBy: [{ required: true, message: '请选择货编号', trigger: 'change' }]
+        orderBy: [{ required: true, message: '请选择货编号', trigger: 'change' }]
       },
       formItemLayout: {
         labelCol: { span: 6 },
@@ -139,7 +139,7 @@ export default {
                 priceType: _this.form.priceType,
                 type: isPrint || 'preview'
               }
-              // 打印货编号
+              // 打印货编号
               if (_this.form.orderBy != '-1') {
                 obj.orderBy = _this.form.orderBy
                 obj.priceType = obj.priceType + '_STACK_PLACE'

+ 1 - 1
src/views/salesManagement/stockPrint/list.vue

@@ -303,7 +303,7 @@ export default {
         type: 'DISPATCH_BILL_TYPE',
         dispatchBillSn: obj.dispatchBillSn
       }
-      // 货编号
+      // 货编号
       if (obj.orderBy) {
         params.type = params.type + '_STACK_PLACE'
       }

+ 2 - 2
src/views/salesReturnManagement/salesReturn/printModal.vue

@@ -31,7 +31,7 @@
             <a-radio value="SALES_RETURN">不打印</a-radio>
           </a-radio-group>
         </a-form-model-item>
-        <a-form-model-item label="货编号" prop="orderBy" v-if="nowType!='export'">
+        <a-form-model-item label="货编号" prop="orderBy" v-if="nowType!='export'">
           <a-radio-group v-model="form.orderBy">
             <a-radio value="ASC">打印(↑升序)</a-radio>
             <a-radio value="DESC">打印(↓降序)</a-radio>
@@ -74,7 +74,7 @@ export default {
       },
       rules: {
         priceType: [{ required: true, message: '请选择退货价格', trigger: 'change' }],
-        orderBy: [{ required: true, message: '请选择货编号', trigger: 'change' }]
+        orderBy: [{ required: true, message: '请选择货编号', trigger: 'change' }]
       },
       formItemLayout: {
         labelCol: { span: 6 },