lilei 3 سال پیش
والد
کامیت
fb6609d29d

+ 9 - 3
src/components/custom.less

@@ -6,7 +6,7 @@ body{
     font-size: 12px!important;
   }
   .ant-form-item-label > label{
-    color: #333!important;
+    color: #000!important;
   }
 }
 // 查询条件样式
@@ -139,7 +139,7 @@ body{
       .ant-table-header tr th, .ant-table-thead tr th{
         background: #fafafa!important;
         font-weight: bold;
-        color: #333!important;
+        color: #000!important;
         padding: 5px 5px 2px!important;
       }
     }
@@ -153,8 +153,14 @@ body{
   .ant-pagination.ant-table-pagination{
     margin: 10px 0 0;
   }
-  .ant-table-small > .ant-table-content > .ant-table-body{
+  .ant-table-small > .ant-table-content .ant-table-body{
     margin: 0;
+    tr:hover{
+      td{
+        background: rgba(255, 170, 127, 0.6);
+        color: #fff;
+      }
+    }
   }
 }
 .sTable.fixPagination{

+ 10 - 0
src/components/global.less

@@ -674,6 +674,16 @@ body {
 }
 
 // btn-link
+.ant-btn-link.button-default {
+  color: #1b1b1b;
+  &:hover, &:focus {
+    color: #66696d;
+  }
+ 
+  &:active, &.active {
+    color: #8e8f91;
+  }
+}
 .ant-btn-link.button-primary {
   color: #39f;
   &:hover, &:focus {

+ 2 - 9
src/libs/JGPrint.js

@@ -23,16 +23,9 @@ export const JGPrint = function (data, type, printerType) {
       })
       return
     }
-    const rx = /<body[^>]*>([\s\S]+?)<\/body>/i///
-    let m = rx.exec(data)
-    if (m) m = m[1]
     LODOP.SET_SHOW_MODE('HIDE_PAPER_BOARD', 1) //  隐藏底图上有模拟走纸板的条纹线
-    LODOP.SET_PRINT_PAGESIZE(3, '2100', '60', '') // 这里3表示纵向打印且纸高“按内容的高度”;2140表示纸宽214.0mm;60表示页底空白6.0mm
-    LODOP.ADD_PRINT_HTM('0', '0', 'RightMargin:0.1cm', 'BottomMargin:0.1cm', m)
-    // LODOP.ADD_PRINT_TABLE(0, 0, '100%', '100%', m)
-    // LODOP.ADD_PRINT_PDF(0, 0, '100%', '100%', data)
-    // LODOP.SET_PRINT_STYLEA(0, 'PDFScalMode', 1)
-    // LODOP.SET_PRINT_PAGESIZE(3, 0, 0, '')
+    LODOP.ADD_PRINT_HTM('0', '0', 'RightMargin:0.1cm', 'BottomMargin:0.1cm', data)
+    LODOP.SET_PRINT_PAGESIZE(3, 2140, '60', '') // 这里3表示纵向打印且纸高“按内容的高度”;2140表示纸宽214.0mm;60表示页底空白6.0mm
     if (type == 'preview') {
       LODOP.PREVIEW()
     }

+ 11 - 11
src/views/productManagement/productInfoJg/list.vue

@@ -19,7 +19,7 @@
               <a-input id="productInfoList-origCode" v-model.trim="queryParam.origCode" allowClear placeholder="请输入原厂编码"/>
             </a-form-item>
           </a-col>
-          <template v-if="advanced">
+          <!-- <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-item label="产品品牌">
                 <a-select
@@ -53,7 +53,7 @@
                 <v-select code="ONLINE_FLAG" id="productInfoList-onlineFalg" v-model="queryParam.onlineFalg" allowClear placeholder="请选择状态"></v-select>
               </a-form-item>
             </a-col>
-          </template>
+          </template> -->
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productInfoList-reset">重置</a-button>
@@ -64,10 +64,10 @@
               :disabled="disabled"
               :loading="exportLoading"
               id="inventoryQueryList-export">导出</a-button> -->
-            <a @click="advanced=!advanced" style="margin-left: 5px">
+            <!-- <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
-            </a>
+            </a> -->
           </a-col>
         </a-row>
       </a-form>
@@ -131,7 +131,7 @@ export default {
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
-        onlineFalg: undefined //  状态
+        onlineFalg: '1'
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false, // 导出loading
@@ -183,7 +183,7 @@ export default {
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
-      this.queryParam.onlineFalg = undefined
+      this.queryParam.onlineFalg = '1'
       this.productType = []
       this.$refs.table.refresh(true)
     },
@@ -194,15 +194,15 @@ export default {
         { title: '产品编码', dataIndex: 'code', align: 'center', width: 120, customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'origCode', align: 'center', width: 120, customRender: function (text) { return text || '--' } },
-        { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: 80, align: 'center' },
-        { title: '产品品牌', dataIndex: 'productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 120, align: 'center' }
+        { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: 80, align: 'center' }
+        // { title: '产品品牌', dataIndex: 'productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 120, align: 'center' }
       ]
       const cArr = [
         { title: '终端价', dataIndex: 'terminalPrice', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '车主价', dataIndex: 'carOwnersPrice', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '创建时间', dataIndex: 'createDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', dataIndex: 'onlineFalgDictValue', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '创建时间', dataIndex: 'createDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '状态', dataIndex: 'onlineFalgDictValue', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ]
       getCurrentDealer().then(res => {

+ 14 - 15
src/views/salesManagement/salesQuery/edit.vue

@@ -80,14 +80,22 @@
               </a-form-model>
             </a-col>
             <a-col :span="6">
-              <div style="float:right;overflow: hidden;">
+              <div style="float:right;overflow: hidden;margin-top: 5px;">
                 <a-button
                   size="small"
-                  type="primary"
+                  type="info"
                   @click="delSalerDetailAll"
                   :loading="delLoading"
-                  style="margin-left: 10px"
+                  style="margin-right: 10px"
                   id="salesEdit-del-all">整单删除</a-button>
+                <a-button
+                  size="small"
+                  style="padding: 0 20px;"
+                  type="primary"
+                  :disabled="spinning"
+                  class="button-primary"
+                  @click="handleSubmit()"
+                  id="productInfoList-handleSubmit">提交</a-button>
               </div>
             </a-col>
           </a-row>
@@ -100,8 +108,8 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :scroll="{ y: 300 }"
           :defaultLoadData="false"
+          :pageSize="10"
           :rowClassName="(record, index) => record.cost > record.price ? 'redBg-row':''"
           bordered>
           <!-- 产品编码 -->
@@ -141,7 +149,7 @@
           <template slot="action" slot-scope="text, record">
             <a-button
               size="small"
-              type="primary"
+              type="link"
               :loading="delLoading"
               class="button-error"
               @click="handleDel(record)"
@@ -150,16 +158,7 @@
         </s-table>
       </a-card>
     </a-spin>
-    <div class="affix-cont">
-      <a-button
-        size="large"
-        style="padding: 0 60px;"
-        type="primary"
-        :disabled="spinning"
-        class="button-primary"
-        @click="handleSubmit()"
-        id="productInfoList-handleSubmit">提交</a-button>
-    </div>
+    <!-- <div class="affix-cont"></div> -->
     <!-- 选择客户弹框 -->
     <choose-custom-modal ref="custModal" :show="openModal" @updateData="updateData" @cancel="openModal=false" />
   </div>

+ 12 - 9
src/views/salesManagement/salesQuery/queryPart.vue

@@ -116,7 +116,8 @@
       :data="loadData"
       :customRow="handleClickRow"
       :defaultLoadData="false"
-      :scroll="{ y: 300 }"
+      :pageSize="10"
+      :scroll="{ y: 144 }"
       bordered>
       <!-- 售价 -->
       <template slot="salePrice" slot-scope="text, record">
@@ -148,14 +149,14 @@
       <template slot="action" slot-scope="text, record">
         <a-button
           size="small"
-          type="primary"
-          class="button-info"
+          type="link"
+          class="button-error"
           @click="handleAdd(record)"
           id="productInfoList-edit-btn">添加</a-button>
         <a-button
           size="small"
-          type="primary"
-          class="button-success"
+          type="link"
+          class="button-default"
           @click="handleDetail(record)"
           id="productInfoList-detail-btn"
           style="margin-left: 5px;">销售记录</a-button>
@@ -210,7 +211,7 @@ export default {
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
-        warehouseSn: undefined //  仓库
+        warehouseSn: undefined //  仓库
       },
       priceType: '',
       buyerSn: '',
@@ -280,14 +281,16 @@ export default {
     columns () {
       const arr = [
         { title: '产品编码', dataIndex: 'productCode', width: '14%', align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'productName', width: '18%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品牌', dataIndex: 'brandName', width: '10%', align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '库存数量', dataIndex: 'currentQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '售价', dataIndex: 'salePrice', scopedSlots: { customRender: 'salePrice' }, width: '9%', align: 'center' },
         { title: '销售数量', dataIndex: 'salesNums', scopedSlots: { customRender: 'nums' }, width: '9%', align: 'center' },
-        { title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' }, width: '13%', align: 'center' }
+        { title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' }, width: '9%', align: 'center' }
       ]
       if (this.cost) {
         arr.splice(6, 0, { title: '成本价', dataIndex: 'putCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
@@ -334,7 +337,7 @@ export default {
           data = {
             list: [],
             pageNo: 1,
-            pageSize: 20
+            pageSize: 10
           }
         }
         _this.disabled = false