lilei 8 meses atrás
pai
commit
176c132f7b

+ 1 - 1
public/version.json

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

+ 7 - 16
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -31,11 +31,11 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ y: 500,x: tableWidth }"
+        :scroll="{ y: 500 }"
         bordered>
         <!-- 操作 -->
         <template slot="putCost" slot-scope="text, record">
-          <a-input-number
+          <!-- <a-input-number
             :id="'salesEdit-price-'+record.productSn"
             size="small"
             v-model="record.putCost"
@@ -44,14 +44,8 @@
             :max="999999"
             placeholder="请输入"
             @blur="e => priceBlur(e.target.value, record)"
-            style="width: 100%;" />
-        </template>
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            class="button-primary"
-            :id="'inventoryQueryDetail-editPrice-'+record.id">修改成本单价</a-button>
+            style="width: 100%;" /> -->
+          {{ record.putCost }}
         </template>
       </s-table>
       <div class="btn-cont">
@@ -86,17 +80,14 @@ export default {
     modalTit () {
       return '库存详情'
     },
-    tableWidth () {
-      return window.innerWidth * 0.75 - 30
-    },
     // 列
     columns () {
+      const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: 40, align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: 150, align: 'left', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '批次号', dataIndex: 'batchNo', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库时间', dataIndex: 'putTime', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: 100, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
@@ -105,8 +96,8 @@ export default {
         { title: '冻结库存数量', dataIndex: 'freezeQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.push({ title: '成本单价', dataIndex: 'putCost', width: 100, align: 'right', scopedSlots: { customRender: 'putCost' }, fixed: 'right' })
-        // arr.push({ title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' })
+        // arr.push({ title: '成本单价', dataIndex: 'putCost', width: 100, align: 'right', scopedSlots: { customRender: 'putCost' } })
+        arr.push({ title: '成本单价', dataIndex: 'putCost', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }