Просмотр исходного кода

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

chenrui 4 лет назад
Родитель
Сommit
a4f801ff2a

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

@@ -154,7 +154,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: '财务状态', scopedSlots: { customRender: 'settleState' }, width: 110, align: 'center' },
+        { title: '财务状态', dataIndex: 'settleState', scopedSlots: { customRender: 'settleState' }, width: 110, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 250, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象

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

@@ -127,8 +127,8 @@
             @click="handleDel(record)"
             class="button-error"
             id="bulkWarehousingOrderList-del-btn">删除</a-button>
-            <!-- <span v-if="record.state == 'FINISH' && record.state != 'WAIT_PUT_WAREHOUSE'">--</span> -->
-            <span v-if="(record.state == 'FINISH' || !$hasPermissions('B_bulkWarehousingOrder_edit')) &&(record.state == 'FINISH' || !$hasPermissions('B_bulkWarehousingOrder_del')) &&(record.state != 'WAIT_PUT_WAREHOUSE' || !$hasPermissions('B_bulkWarehousingOrder_put'))">--</span>
+          <!-- <span v-if="record.state == 'FINISH' && record.state != 'WAIT_PUT_WAREHOUSE'">--</span> -->
+          <span v-if="(record.state == 'FINISH' || !$hasPermissions('B_bulkWarehousingOrder_edit')) &&(record.state == 'FINISH' || !$hasPermissions('B_bulkWarehousingOrder_del')) &&(record.state != 'WAIT_PUT_WAREHOUSE' || !$hasPermissions('B_bulkWarehousingOrder_put'))">--</span>
         </template>
       </s-table>
     </a-spin>
@@ -174,7 +174,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: 'stateDictValue', width: 100, align: 'center' },
-        { title: '财务状态', scopedSlots: { customRender: 'settleState' }, width: 100, align: 'center' },
+        { title: '财务状态', dataIndex: 'settleState', scopedSlots: { customRender: 'settleState' }, width: 100, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象

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

@@ -281,7 +281,7 @@ export default {
     // 汇总
     settleExpenseQuerySum (params) {
       settleExpenseQuerySum(params).then(res => {
-        this.totalData.totalAmount = res.data.settleAmount || 0
+        this.totalData.totalAmount = res.data && res.data.settleAmount || 0
       })
     },
     //  重置