Browse Source

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

lilei 4 năm trước cách đây
mục cha
commit
9b03d5dc2d

+ 1 - 1
src/views/allocationManagement/chainTransferIn/list.vue

@@ -164,7 +164,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 220
+          this.tableHeight = window.innerHeight - 80
         }
         // 入库时间
         if (this.time && this.time.length > 0) {

+ 1 - 1
src/views/allocationManagement/chainTransferOut/list.vue

@@ -179,7 +179,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 275
+          this.tableHeight = window.innerHeight - 380
         }
         // 创建时间
         if (this.createDate && this.createDate.length > 0) {

+ 3 - 3
src/views/bulkManagement/bulkWarehousingOrder/detail.vue

@@ -67,8 +67,8 @@
         </a-collapse-panel>
       </a-collapse>
     </a-card>
-    <!-- 单据记录 -->
-    <a-card size="small" :bordered="false" class="bulkWarehousingOrderDetail-cont">
+    <!-- 单据记录  二期 -->
+    <!-- <a-card size="small" :bordered="false" class="bulkWarehousingOrderDetail-cont">
       <a-collapse :activeKey="['1']">
         <a-collapse-panel key="1" header="单据记录">
           <a-timeline class="timeline-box">
@@ -83,7 +83,7 @@
           </a-timeline>
         </a-collapse-panel>
       </a-collapse>
-    </a-card>
+    </a-card> -->
   </div>
 </template>
 

+ 1 - 1
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -179,7 +179,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 275
+          this.tableHeight = window.innerHeight - 440
         }
         // 创建时间
         if (this.createDate && this.createDate.length > 0) {

+ 3 - 3
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -21,7 +21,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1420 }"
+      :scroll="{ x: 1580 }"
       bordered>
       <!-- 库存数量 -->
       <template slot="currentQty" slot-scope="text, record">
@@ -62,9 +62,9 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
-        { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库时间', dataIndex: 'putTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },

+ 2 - 2
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -38,7 +38,7 @@
               <a-form-item label="产品分类">
                 <a-cascader
                   :options="typeData"
-				  expand-trigger="hover"
+                  expand-trigger="hover"
                   :field-names="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
                   placeholder="请选择产品分类"
                   allowClear
@@ -154,7 +154,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         if (this.tableHeight == 0) {
-          this.tableHeight = window.innerHeight - 340
+          this.tableHeight = window.innerHeight - 370
         }
         return stockList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data