瀏覽代碼

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

lilei 4 年之前
父節點
當前提交
7f7535269b

+ 21 - 0
src/api/allocLinkageOut.js

@@ -44,6 +44,27 @@ export const allocLinkageOutDetailSn = (params) => {
     method: 'get'
   })
 }
+//  连锁调拨调出  审核
+export const allocLinkageAudit = (params) => {
+  return axios({
+    url: `/allocLinkageOut/audit/${params.sn}`,
+    method: 'get'
+  })
+}
+//  连锁调拨调出  出库
+export const allocLinkageOutStock = (params) => {
+  return axios({
+    url: `/allocLinkageOut/outStock/${params.sn}`,
+    method: 'get'
+  })
+}
+//  连锁调拨调出  删除
+export const allocLinkageOutDel = (params) => {
+  return axios({
+    url: `/allocLinkageOut/delete/${params.id}`,
+    method: 'get'
+  })
+}
 //  连锁调拨调出  详情  添加
 export const allocLinkageOutDetailSave = (params) => {
   return axios({

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

@@ -78,11 +78,11 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" @click="handleWarehousing(record)" id="chainTransferInList-warehousing-btn">入库</a-button>
+        <a-button size="small" type="link" class="button-primary" @click="handleWarehousing(record)" id="chainTransferInList-warehousing-btn">入库</a-button>
         <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleExamine(record)" id="chainTransferInList-examine-btn">审核</a-button>
+        <a-button size="small" type="link" class="button-warning" @click="handleExamine(record)" id="chainTransferInList-examine-btn">审核</a-button>
         <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleEdit(record)" id="chainTransferInList-edit-btn">编辑</a-button>
+        <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" id="chainTransferInList-edit-btn">编辑</a-button>
         <a-divider type="vertical" style="margin: 0;" />
         <a-button size="small" type="link" @click="handleDetail(record)" id="chainTransferInList-detail-btn">详情</a-button>
       </template>

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

@@ -100,7 +100,7 @@
                 v-model="record.outQty"
                 :precision="0"
                 :min="1"
-                :max="999999"
+                :max="record.currentQty"
                 placeholder="请输入"
                 style="width: 100%;" />
             </template>

+ 107 - 43
src/views/allocationManagement/chainTransferOut/list.vue

@@ -18,13 +18,16 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="调往对象">
-              <v-select
-                v-model="queryParam.putTenantName"
-                ref="putTenantName"
-                id="chainTransferOutList-putTenantName"
-                code="PAYMENT_TYPE"
+              <a-select
                 placeholder="请选择调往对象"
-                allowClear></v-select>
+                allowClear
+                id="chainTransferOutList-putTenantSn"
+                v-model="queryParam.putTenantSn"
+                :showSearch="true"
+                option-filter-prop="children"
+                :filter-option="filterOption">
+                <a-select-option v-for="item in putTenantSnData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
+              </a-select>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -33,20 +36,20 @@
                 v-model="queryParam.allocationType"
                 ref="allocationType"
                 id="chainTransferOutList-allocationType"
-                code="PAYMENT_TYPE"
+                code="ALLOCATION_LINKAGE_PRODUCT_TYPE"
                 placeholder="请选择调出产品类型"
                 allowClear></v-select>
             </a-form-item>
           </a-col>
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-item label="单据状态">
+              <a-form-item label="业务状态">
                 <v-select
                   v-model="queryParam.state"
                   ref="state"
                   id="chainTransferOutList-state"
-                  code="PAYMENT_TYPE"
-                  placeholder="请选择单据状态"
+                  code="ALLOCATION_LINKAGE_OUT_STATUS"
+                  placeholder="请选择业务状态"
                   allowClear></v-select>
               </a-form-item>
             </a-col>
@@ -64,7 +67,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="chainTransferOutList-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
+      <a-button id="chainTransferOutList-add" type="prim ary" class="button-error" @click="openModal=true">新增</a-button>
     </div>
     <!-- 列表 -->
     <s-table
@@ -80,12 +83,41 @@
       <template slot="allocationLinkageOutNo" slot-scope="text, record">
         <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.allocationLinkageOutNo }}</span>
       </template>
+      <!-- 财务状态 -->
+      <template slot="settleState" slot-scope="text, record">
+        <a-badge :color="text=='FINISH'?'#87d068':'gold'" :text="record.settleStateDictValue" />
+      </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" class="button-success" @click="handleExamine(record)" id="chainTransferOutList-examine-btn">审核</a-button>
-        <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" id="chainTransferOutList-edit-btn">编辑</a-button>
-        <a-button size="small" type="link" class="button-warning" @click="handleOut(record)" id="chainTransferOutList-out-btn">出库</a-button>
-        <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="chainTransferOutList-del-btn">删除</a-button>
+        <a-button
+          size="small"
+          type="link"
+          v-if="record.state == 'WAIT_AUDIT'"
+          class="button-warning"
+          @click="handleExamine(record)"
+          id="chainTransferOutList-examine-btn">审核</a-button>
+        <a-button
+          size="small"
+          type="link"
+          v-if="record.state == 'WAIT_SUBMIT' || record.state == 'WAIT_AUDIT'"
+          class="button-info"
+          @click="handleEdit(record)"
+          id="chainTransferOutList-edit-btn">编辑</a-button>
+        <a-button
+          size="small"
+          type="link"
+          v-if="record.state == 'WAIT_OUT_WAREHOUSE'"
+          class="button-primary"
+          @click="handleOut(record)"
+          id="chainTransferOutList-out-btn">出库</a-button>
+        <a-button
+          size="small"
+          type="link"
+          v-if="record.state == 'WAIT_SUBMIT' || record.state == 'WAIT_AUDIT' || record.state == 'WAIT_OUT_WAREHOUSE'"
+          class="button-error"
+          @click="handleDel(record)"
+          id="chainTransferOutList-del-btn">删除</a-button>
+        <span v-if="record.state != 'WAIT_SUBMIT' && record.state != 'WAIT_AUDIT' && record.state != 'WAIT_OUT_WAREHOUSE'">--</span>
       </template>
     </s-table>
     <!-- 新增/编辑 -->
@@ -94,9 +126,10 @@
 </template>
 
 <script>
+import moment from 'moment'
 import { STable, VSelect } from '@/components'
 import basicInfoModal from './basicInfoModal.vue'
-import { allocLinkageOutList } from '@/api/allocLinkageOut'
+import { allocLinkageOutList, allocLinkageAudit, allocLinkageOutDel, allocLinkageOutStock, getTenantList } from '@/api/allocLinkageOut'
 export default {
   components: { STable, VSelect, basicInfoModal },
   data () {
@@ -104,9 +137,9 @@ export default {
       advanced: false, // 高级搜索 展开/关闭
       createDate: undefined, //  创建时间
       queryParam: { //  查询条件
-        putTenantName: undefined, //  调往对象
+        putTenantSn: undefined, //  调往对象
         allocationType: undefined, //  调出产品类型
-        state: undefined //  单据状态
+        state: undefined //  业务状态
       },
       disabled: false, //  查询、重置按钮是否可操作
       dateFormat: 'YYYY-MM-DD',
@@ -119,15 +152,22 @@ export default {
         { title: '总数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总成本', dataIndex: 'productTotalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调拨类型', dataIndex: 'allocationType', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调拨类型', dataIndex: 'allocationTypeDictValue', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', dataIndex: 'settleStateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务状态', scopedSlots: { customRender: 'settleState' }, width: 100, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 210, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        this.queryParam = {}
+        // 创建时间
+        if (this.createDate && this.createDate.length > 0) {
+          this.queryParam.beginDate = moment(this.createDate[0]).format(this.dateFormat)
+          this.queryParam.endDate = moment(this.createDate[1]).format(this.dateFormat)
+        } else {
+          this.queryParam.beginDate = undefined
+          this.queryParam.endDate = undefined
+        }
         return allocLinkageOutList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -138,6 +178,7 @@ export default {
           return data
         })
       },
+      putTenantSnData: [],
       openModal: false, //  新增编辑  弹框
       itemId: '' //  当前品牌id
     }
@@ -149,7 +190,7 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.queryParam.putTenantName = undefined
+      this.queryParam.putTenantSn = undefined
       this.queryParam.allocationType = undefined
       this.queryParam.state = undefined
       this.createDate = undefined
@@ -157,7 +198,7 @@ export default {
     },
     //  基本信息  保存
     handleOk (data) {
-      this.$router.push({ path: `/allocationManagement/chainTransferOut/add/${data.allocationLinkageOutSn}` })
+      this.$router.push({ path: `/allocationManagement/chainTransferOut/add/${data.id}/${data.allocationLinkageOutSn}` })
     },
     //  删除
     handleDel (row) {
@@ -167,39 +208,46 @@ export default {
         content: '删除后不可恢复,确定要进行删除吗?',
         centered: true,
         onOk () {
-          // delectRolePower({
-          //   id: row.id
-          // }).then(res => {
-          //   console.log(res, 'res1111')
-          //   if (res.status == 200) {
-          //     _this.$message.success(res.message)
-          //     _this.$refs.table.refresh()
-          //   }
-          // })
+          allocLinkageOutDel({ sn: row.allocationLinkageOutSn }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.refresh()
+            }
+          })
         }
       })
     },
     //  出库
     handleOut (row) {
-
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '确认要出库吗?',
+        centered: true,
+        onOk () {
+          allocLinkageOutStock({ sn: row.allocationLinkageOutSn }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.refresh()
+            }
+          })
+        }
+      })
     },
     //  审核
-    handleExamine () {
+    handleExamine (row) {
       const _this = this
       this.$confirm({
         title: '提示',
         content: '确认要审核通过吗?',
         centered: true,
         onOk () {
-          // delectRolePower({
-          //   id: row.id
-          // }).then(res => {
-          //   console.log(res, 'res1111')
-          //   if (res.status == 200) {
-          //     _this.$message.success(res.message)
-          //     _this.$refs.table.refresh()
-          //   }
-          // })
+          allocLinkageAudit({ sn: row.allocationLinkageOutSn }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$refs.table.refresh()
+            }
+          })
         }
       })
     },
@@ -210,7 +258,23 @@ export default {
     //  新增/编辑
     handleEdit (row) {
       this.$router.push({ path: `/allocationManagement/chainTransferOut/edit/${row.id}/${row.allocationLinkageOutSn}` })
+    },
+    // 调往对象
+    getPutTenantList () {
+      getTenantList({}).then(res => {
+        if (res.status == 200) {
+          this.putTenantSnData = res.data
+        } else {
+          this.putTenantSnData = []
+        }
+      })
     }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.openModal = false
+      vm.getPutTenantList()
+    })
   }
 }
 </script>

+ 8 - 4
src/views/allocationManagement/storeTransferOut/list.vue

@@ -83,13 +83,17 @@
       <template slot="storeCallOutNo" slot-scope="text, record">
         <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.storeCallOutNo }}</span>
       </template>
+      <!-- 财务状态 -->
+      <template slot="settleState" slot-scope="text, record">
+        <a-badge :color="text=='FINISH'?'#87d068':'gold'" :text="record.settleStateDictValue" />
+      </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
         <a-button
           size="small"
           type="link"
           v-if="record.state == 'WAIT_AUDIT'"
-          class="button-success"
+          class="button-warning"
           @click="handleExamine(record)"
           id="storeTransferOutList-examine-btn">审核</a-button>
         <a-button
@@ -103,7 +107,7 @@
           size="small"
           type="link"
           v-if="record.state == 'WAIT_OUT_WAREHOUSE'"
-          class="button-warning"
+          class="button-primary"
           @click="handleOut(record)"
           id="storeTransferOutList-out-btn">出库</a-button>
         <a-button
@@ -152,7 +156,7 @@ export default {
         { title: '总成本', dataIndex: 'productTotalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: 110, align: 'center' },
-        { title: '财务状态', dataIndex: 'settleStateDictValue', width: 110, align: 'center' },
+        { title: '财务状态', scopedSlots: { customRender: 'settleState' }, width: 110, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 250, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -223,7 +227,7 @@ export default {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: '确认要进行出库操作吗?',
+        content: '确认要出库吗?',
         centered: true,
         onOk () {
           storeCallOutOut({ storeCallOutSn: row.storeCallOutSn }).then(res => {

+ 3 - 3
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -32,13 +32,13 @@
           </a-col>
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-item label="单据状态">
+              <a-form-item label="业务状态">
                 <v-select
                   v-model="queryParam.state"
                   ref="state"
                   id="warehouseAllocationList-state"
                   code="ALLOCATION_WAREHOUSE_STATE"
-                  placeholder="请选择单据状态"
+                  placeholder="请选择业务状态"
                   allowClear
                 ></v-select>
               </a-form-item>
@@ -138,7 +138,7 @@ export default {
         { title: '总数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总成本', dataIndex: 'productTotalCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', dataIndex: 'stateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'stateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 1 - 1
src/views/bulkManagement/bulkReturnGoods/edit.vue

@@ -140,7 +140,7 @@
               </template>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
-                <a-button size="small" type="primary" @click="handleDel(record)" id="bulkReturnGoodsEdit-del-btn">删除</a-button>
+                <a-button size="small" type="primary" class="button-error" @click="handleDel(record)" id="bulkReturnGoodsEdit-del-btn">删除</a-button>
               </template>
             </s-table>
           </div>

+ 2 - 2
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -74,13 +74,13 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" @click="handleEdit(record)" id="bulkReturnGoodsList-edit-btn">编辑</a-button>
+        <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" id="bulkReturnGoodsList-edit-btn">编辑</a-button>
         <a-divider type="vertical" style="margin: 0;" />
         <a-button size="small" type="link" @click="handleDetail(record)" id="bulkReturnGoodsList-detail-btn">详情</a-button>
         <a-divider type="vertical" style="margin: 0;" />
         <a-button size="small" type="link" @click="handleAdopt(record)" id="bulkReturnGoodsList-isAdopt-btn">{{ record.adopt == 0 ? '通过' : '不通过' }}</a-button>
         <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleDel(record)" id="bulkReturnGoodsList-del-btn">删除</a-button>
+        <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="bulkReturnGoodsList-del-btn">删除</a-button>
       </template>
     </s-table>
     <!-- 选择基本信息弹框 -->

+ 1 - 0
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -601,6 +601,7 @@ export default {
       this.disabled = true
       this.pageNo = pageNo || this.pageNo
       const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
+      params.enabledFlag = 1
       dealerProductList(params).then(res => {
         if (res.status == 200) {
           const data = res.data

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

@@ -120,7 +120,7 @@
           type="link"
           v-if="record.state == 'WAIT_PUT_WAREHOUSE'"
           @click="handleWarehouse(record)"
-          class="button-warning"
+          class="button-primary"
           id="bulkWarehousingOrderList-warehouse-btn">入库</a-button>
         <a-button
           size="small"
@@ -249,7 +249,7 @@ export default {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: '确定是否入库?',
+        content: '确定要入库吗?',
         centered: true,
         onOk () {
           sparePartsPurPut({ id: row.id }).then(res => {

+ 1 - 1
src/views/financialManagement/companyReceivablePayable/paymentSlip.vue

@@ -140,7 +140,7 @@
               </template>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
-                <a-button size="small" type="primary" @click="handleDel(record)" id="paymentSlipEdit-del-btn">删除</a-button>
+                <a-button size="small" type="primary" class="button-error" @click="handleDel(record)" id="paymentSlipEdit-del-btn">删除</a-button>
               </template>
             </s-table>
           </div>

+ 1 - 1
src/views/financialManagement/companyReceivablePayable/receipt.vue

@@ -140,7 +140,7 @@
               </template>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
-                <a-button size="small" type="primary" @click="handleDel(record)" id="receiptEdit-del-btn">删除</a-button>
+                <a-button size="small" type="primary" class="button-error" @click="handleDel(record)" id="receiptEdit-del-btn">删除</a-button>
               </template>
             </s-table>
           </div>

+ 1 - 1
src/views/financialManagement/expenseManagement/list.vue

@@ -81,7 +81,7 @@
           size="small"
           type="link"
           v-if="record.state != 'AUDIT_PASS'"
-          class="button-primary"
+          class="button-info"
           @click="handleEdit(record)"
           id="expenseManagement-edit-btn">编辑</a-button>
         <a-button

+ 3 - 3
src/views/inventoryManagement/inventoryChecking/list.vue

@@ -48,15 +48,15 @@
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-        <a-button size="small" type="link" @click="handleEexamine(record)" id="inventoryCheckingList-eexamine-btn">审核</a-button>
+        <a-button size="small" type="link" class="button-warning" @click="handleEexamine(record)" id="inventoryCheckingList-eexamine-btn">审核</a-button>
         <a-divider type="vertical" style="margin: 0;" />
         <a-button size="small" type="link" @click="handleInventory(record)" id="inventoryCheckingList-inventory-btn">盘点</a-button>
         <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleEdit(record)" id="inventoryCheckingList-edit-btn">编辑</a-button>
+        <a-button size="small" type="link" class="button-info" @click="handleEdit(record)" id="inventoryCheckingList-edit-btn">编辑</a-button>
         <a-divider type="vertical" style="margin: 0;" />
         <a-button size="small" type="link" @click="handleDetail(record)" id="inventoryCheckingList-detail-btn">详情</a-button>
         <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleDel(record)" id="inventoryCheckingList-del-btn">删除</a-button>
+        <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="inventoryCheckingList-del-btn">删除</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑盘点单 -->

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/selfDisk.vue

@@ -141,7 +141,7 @@
               bordered>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
-                <a-button size="small" type="link" @click="handleDel(record)" id="selfDisk-del-btn">删除</a-button>
+                <a-button size="small" type="link" class="button-error" @click="handleDel(record)" id="selfDisk-del-btn">删除</a-button>
               </template>
             </s-table>
           </div>

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

@@ -20,11 +20,11 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1340 }"
+      :scroll="{ x: 1420 }"
       bordered>
       <!-- 库存数量 -->
       <template slot="currentQty" slot-scope="text, record">
-        {{ record.currentQty }}
+        {{ record.currentQty + record.freezeQty }}
         <span v-if="record.freezeQty">(冻结{{ record.freezeQty }})</span>
       </template>
     </s-table>
@@ -68,7 +68,7 @@ export default {
         { 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 || '--' } },
         { title: '入库类型', dataIndex: 'putBizTypeDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '库存数量', scopedSlots: { customRender: 'currentQty' }, width: 100, align: 'center' },
+        { title: '库存数量', scopedSlots: { customRender: 'currentQty' }, width: 180, align: 'center' },
         { title: '成本单价', dataIndex: 'putCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象

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

@@ -92,7 +92,7 @@
       </template>
       <!-- 现有库存数量 -->
       <template slot="currentStockQty" slot-scope="text, record">
-        {{ record.currentStockQty }}
+        {{ record.currentStockQty + record.freezeQty }}
         <span v-if="record.freezeQty">(冻结{{ record.freezeQty }})</span>
       </template>
       <!-- 操作 -->

+ 10 - 5
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -58,22 +58,27 @@
       <template slot="purchaseReturnNo" slot-scope="text, record">
         <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.purchaseReturnNo }}</span>
       </template>
+      <!-- 财务状态 -->
+      <template slot="settleState" slot-scope="text, record">
+        <a-badge :color="text=='FINISH'?'#87d068':'gold'" :text="record.settleStateDictValue" />
+      </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
         <a-button
           size="small"
-          type="primary"
+          type="link"
           class="button-info"
-          v-if="record.state != 'WAIT_AUDIT'"
+          v-if="record.state == 'WAIT'"
           @click="handleEdit(record)"
           id="purchaseReturnList-edit-btn">编辑</a-button>
         <a-button
           size="small"
-          type="primary"
+          type="link"
           class="button-error"
-          v-if="record.state != 'WAIT_AUDIT'"
+          v-if="record.state == 'WAIT'"
           @click="handleDel(record)"
           id="purchaseReturnList-del-btn">删除</a-button>
+        <span v-if="record.state != 'WAIT'">--</span>
       </template>
     </s-table>
   </a-card>
@@ -102,7 +107,7 @@ export default {
         { title: '退款金额', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', dataIndex: 'settleStateDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务状态', scopedSlots: { customRender: 'settleState' }, width: 140, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 4 - 4
src/views/salesManagement/outboundOrder/list.vue

@@ -82,7 +82,7 @@
       :columns="columns"
       :data="loadData"
       :showPagination="false"
-      :scroll="{ x: 1700 }"
+      :scroll="{ x: 1710 }"
       bordered> -->
     <s-table
       class="sTable"
@@ -91,7 +91,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1700, y: tableHeight }"
+      :scroll="{ x: 1720, y: tableHeight }"
       bordered>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
@@ -99,7 +99,7 @@
           size="small"
           type="link"
           v-if="record.state=='WAIT'"
-          class="button-warning"
+          class="button-primary"
           @click="handleOutbound(record)"
           id="outboundOrderList-out-btn">出库</a-button>
         <a-button
@@ -136,7 +136,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
-        { title: '关联单号', dataIndex: 'outBizNo', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单号', dataIndex: 'outBizNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'demanderName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'productTotalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },