瀏覽代碼

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

chenrui 1 年之前
父節點
當前提交
6a1553ffd7

二進制
public/templ/采购退货申请单(不良品)产品明细模板.xlsx


二進制
public/templ/采购退货申请单(良品)产品明细模板.xlsx


+ 1 - 1
public/version.json

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

+ 7 - 7
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -394,17 +394,17 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '20%', align: 'center' },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        // { title: '采购单价', dataIndex: 'discountedPrice', width: '20%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '采购数量', scopedSlots: { customRender: 'storageQuantity' }, width: '10%', align: 'center' },
-        { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '15%', align: 'center' },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '24%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '采购数量', scopedSlots: { customRender: 'storageQuantity' }, width: '8%', align: 'center' },
+        { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         // { title: '采购金额', dataIndex: 'discountedAmount', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(3, 0, { title: '采购单价', dataIndex: 'discountedPrice', width: '20%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
-        arr.splice(6, 0, { title: '采购金额', dataIndex: 'discountedAmount', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
+        arr.splice(4, 0, { title: '采购单价', dataIndex: 'discountedPrice', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
+        arr.splice(7, 0, { title: '采购金额', dataIndex: 'discountedAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
       }
       return arr
     }

+ 2 - 0
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -267,6 +267,7 @@ export default {
         { title: '序号', key: 'a', field: 'no', width: '5%', align: 'center', operationColumn: false },
         { title: '产品编码', key: 'b', field: 'productCode', width: '10%', align: 'center', operationColumn: false },
         { title: '产品名称', key: 'c', field: 'productName', width: '25%', align: 'center', operationColumn: false, ellipsis: { showTitle: true } },
+        { title: '原厂编码', key: 'q', field: 'productOrgCode', width: '15%', align: 'center',operationColumn: false },
         { title: '可用库存', key: 'j', field: 'currentStockQty', width: '10%', align: 'center', operationColumn: false },
         { title: '采购数量',
           key: 'd',
@@ -323,6 +324,7 @@ export default {
           row.discountedPriceText = (row.discountedPrice || row.discountedPrice == 0) ? this.toThousands(row.discountedPrice, 2) : '--'
           row.discountedAmountText = (row.discountedAmount || row.discountedAmount == 0) ? this.toThousands(row.discountedAmount, 2) : '--'
           row.currentStockQty = (row.currentStockQty || row.currentStockQty == 0) ? row.currentStockQty : '--'
+          row.productOrgCode = row.dealerProductEntity.origCode || '--'
         }
         this.localDataSource = data.list
         this.disabled = false

+ 1 - 1
src/views/purchasingManagement/purchaseOutOfStock/detailModal.vue

@@ -77,7 +77,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: '17%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'origCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'unit', width: '10%', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '缺货数量', dataIndex: 'qty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单价', dataIndex: 'price', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },

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

@@ -183,7 +183,7 @@
               </template>
               <!-- 备注 -->
               <template slot="returnRemarks" slot-scope="text, record">
-                <a-input size="small" placeholder="请输入备注" v-model="record.returnReasonRemarks" @blur="e => returnReasonChange(e, record, 1)"></a-input>
+                <a-input size="small" placeholder="请输入备注(最多50字符)" :maxLength="50" v-model="record.returnReasonRemarks" @blur="e => returnReasonChange(e, record, 1)"></a-input>
               </template>
               <!-- 操作 -->
               <template slot="action" slot-scope="text, record">
@@ -222,7 +222,7 @@
         </div>
         <div style="line-height: 24px;margin-top:10px;">
           <div>备注</div>
-          <div><a-input size="large" :maxlength="50" placeholder="请输入备注(最多50字符)" v-model="plReturnRemark"></a-input></div>
+          <div><a-input size="large" :maxLength="10" placeholder="请输入备注(最多50字符)" v-model="plReturnRemark"></a-input></div>
         </div>
       </div>
     </commonModal>

+ 2 - 2
vue.config.js

@@ -209,8 +209,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.117/qpls-md',
-        // target: 'https://p.iscm.360arrow.com/qpls-md',
+        // target: 'http://192.168.2.117/qpls-md',
+        target: 'https://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,