浏览代码

Merge branch 'develop_yh11' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh11

chenrui 2 年之前
父节点
当前提交
e40a804c61

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.1.72",
+    "version": "2.1.73",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 2 - 2
src/utils/request.js

@@ -15,7 +15,7 @@ const err = (error) => {
   console.log(error, error.response,error.message,'error')
   const config = error.config
   // 网络连接出错
-  if (error.message.indexOf('Network Error') >= 0 || error.message.indexOf('Request failed') >= 0) {
+  if (error.message.indexOf('Network Error') >= 0) {
     notification.destroy()
     notification.error({
       message: '提示',
@@ -94,7 +94,7 @@ service.interceptors.request.use(config => {
 
 // response interceptor
 service.interceptors.response.use((response) => {
-  // console.log(response, 'response.data.status')
+  console.log(response, 'response.data.status')
   const et = sessionStorage.getItem('errorTips')
   if ((response.data.status == '1001' || response.data.status == '1099') && !et) {
     sessionStorage.setItem('errorTips', 1)

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

@@ -163,7 +163,7 @@
         <!-- 备注 -->
         <template slot="note" slot-scope="text, record">
           <div @click="handleNote(record)">
-            <span class="link-bule">{{ record.remarks || '--' }}</span>
+            <span :title="record.remarks" class="link-bule" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;width:100%;display:block;">{{ record.remarks || '--' }}</span>
           </div>
         </template>
       </s-table>

+ 2 - 2
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -87,8 +87,8 @@
         </div>
       </div>
       <div class="btn-box">
-        <a-button type="primary" class="button-error" @click="handleConfirmationFail">不通过</a-button>
-        <a-button type="primary" class="button-info" @click="handleConfirmationOk">通过</a-button>
+        <a-button type="primary" :loading="spinning" class="button-error" @click="handleConfirmationFail">不通过</a-button>
+        <a-button type="primary" :loading="spinning" class="button-info" @click="handleConfirmationOk">通过</a-button>
       </div>
     </a-modal>
   </a-card>

+ 1 - 1
src/views/salesManagement/receiptPrint/list.vue

@@ -198,7 +198,7 @@ export default {
         { title: '户名', dataIndex: 'bankAccount', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '汇入银行', dataIndex: 'bankName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '足额打款', dataIndex: 'fullPaymentFlagDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '说明', dataIndex: 'explainInfo', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '说明', dataIndex: 'explainInfo', width: '6%', align: 'center', customRender: function (text) { return text || '--' } , ellipsis: true},
         { title: '收款打印状态', dataIndex: 'printStatusDictValue', width: '6%', align: 'center', scopedSlots: { customRender: 'printStatus' } },
         { title: '打印次数', dataIndex: 'printNum', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }