소스 검색

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

chenrui 1 년 전
부모
커밋
af3a8d2271

+ 1 - 1
public/version.json

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

+ 5 - 3
src/views/purchasingManagement/purchaseReturnApplyForm/detail.vue

@@ -21,6 +21,7 @@
               <a-descriptions-item label="采购退货申请单号">{{ basicInfoData&&basicInfoData.purchaseReturnApplyNo || '--' }}</a-descriptions-item>
               <a-descriptions-item label="供应商">{{ basicInfoData&&basicInfoData.returnTargetName || '--' }}</a-descriptions-item>
               <a-descriptions-item label="业务状态">{{ basicInfoData&&basicInfoData.billStatusDictValue || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="退货类别">{{ basicInfoData&&basicInfoData.goodFlagDictValue || '--' }}</a-descriptions-item>
               <a-descriptions-item label="创建时间">{{ basicInfoData&&basicInfoData.createDate || '--' }}</a-descriptions-item>
               <a-descriptions-item label="客服审核时间">{{ basicInfoData&&basicInfoData.auditTime || '--' }}</a-descriptions-item>
             </a-descriptions>
@@ -110,15 +111,16 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'product.code', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'product.name', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '申请退货数量', dataIndex: 'initQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总公司实收数量', dataIndex: 'receiveQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '坏件数量', dataIndex: 'badQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '良品数量', dataIndex: 'goodQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '返库数量', dataIndex: 'backStockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'product.unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货原因', dataIndex: 'returnReason', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总公司变更详情', dataIndex: 'modifyInfo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '退货原因', dataIndex: 'returnReason', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '备注', dataIndex: 'returnReasonRemarks', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '总公司变更详情', dataIndex: 'modifyInfo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
         arr.splice(9, 0, { title: '退货单价', dataIndex: 'price', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })

+ 1 - 1
src/views/purchasingManagement/purchaseReturnApplyForm/edit.vue

@@ -222,7 +222,7 @@
         </div>
         <div style="line-height: 24px;margin-top:10px;">
           <div>备注</div>
-          <div><a-input size="large" placeholder="请输入备注(最多50字符)" v-model="plReturnRemark"></a-input></div>
+          <div><a-input size="large" :maxlength="50" placeholder="请输入备注(最多50字符)" v-model="plReturnRemark"></a-input></div>
         </div>
       </div>
     </commonModal>