lilei hace 2 años
padre
commit
e301aa7c17

+ 1 - 1
public/version.json

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

+ 5 - 3
src/views/purchasingManagement/purchaseOrderNew/chooseProductModal.vue

@@ -216,12 +216,12 @@ export default {
       return this.queryParam.code || this.queryParam.name || this.queryParam.productBrandSn || this.queryParam.productTypeSn1
     },
     tableWidth () {
-      let w = 1100
+      let w = 1260
       if (this.isDealerUp) {
-        w = 1200
+        w = 1360
       }
       if (this.$hasPermissions('M_ShowAllCost')) {
-        w = this.isDealerUp ? 1200 : 1100
+        w = this.isDealerUp ? 1360 : 1260
       }
       return w
     },
@@ -231,6 +231,8 @@ export default {
         { title: '产品编码', scopedSlots: { customRender: 'code' }, width: '150px', align: 'center', fixed: 'left' },
         { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         // { title: '原厂编码', dataIndex: 'origCode', width: '14%', align: 'center', customRender: function (text) { return text && text != ' ' ? text : '--' } },
+        { title: '在途数', dataIndex: 'inTransit', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '可用库存', dataIndex: 'currentStockQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: '80px', align: 'center' },
         { title: '单位', dataIndex: 'unit', width: '60px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '包装数', scopedSlots: { customRender: 'baozh' }, width: '60px', align: 'center' },

+ 4 - 4
src/views/salesManagement/salesQueryNew/chooseProductModal.vue

@@ -141,7 +141,7 @@
       :data="loadData"
       @dblclick="handleClickRow"
       :pageSize="30"
-      :scroll="{ y: tableHeight, x: tableWidth||1800 }"
+      :scroll="{ y: tableHeight, x: tableWidth }"
       bordered>
       <div slot="costTitle">
         <a-tooltip placement="top">
@@ -264,7 +264,7 @@ export default {
       visible: this.showModal,
       title: '添加产品',
       tableHeight: 0,
-      tableWidth: 1800,
+      tableWidth: 1760,
       simpleImage: Empty.PRESENTED_IMAGE_SIMPLE,
       advanced: false, // 高级搜索 展开/关闭
       vinLoading: false,
@@ -360,8 +360,9 @@ export default {
       const arr = [
         { title: '产品编码', dataIndex: 'productCode', width: '150px', align: 'center', sorter: true, customRender: function (text) { return text || '--' }, fixed: 'left' },
         { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '库存数量', dataIndex: 'currentQty', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '品牌', dataIndex: 'brandName', width: '120px', align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
       ]
       if (this.cost) {
         this.tableWidth += 100
@@ -389,7 +390,6 @@ export default {
       }
 
       return arr.concat([
-        { title: '品牌', dataIndex: 'brandName', width: '120px', align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: '120px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '120px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'unit', width: '60px', align: 'center', customRender: function (text) { return text || '--' } },

+ 1 - 1
src/views/salesManagement/salesQueryNew/chooseShelfProduct.vue

@@ -438,7 +438,7 @@ export default {
 	.ant-drawer-body {
 		padding: 5px;
     .table-operator{
-        padding:0 10px 10px 0;
+        padding:5px 0;
         display:flex;
         justify-content: space-between;
         align-items: center;

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

@@ -197,7 +197,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '11%', scopedSlots: { customRender: 'productCode' }, align: 'center' },
-        { title: '产品名称', dataIndex: 'productName', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '11%', align: 'center', customRender: function (text) { return text || '--' },ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: '9%', align: 'center', customRender: function (text) { return text && text != ' ' ? text : '--' } },
         { title: '售价', dataIndex: 'price', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '折后售价', dataIndex: 'discountedPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },

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

@@ -127,8 +127,8 @@
             销售金额合计:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
           </div>
           <div class="action-buttons">
-            <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(0)">新增(零售)</a-button>
-            <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(1)">新增(铺货)</a-button>
+            <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(0)"><a-icon type="plus" /> 新增(零售)</a-button>
+            <a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(1)"><a-icon type="plus" /> 新增(铺货)</a-button>
           </div>
         </div>