瀏覽代碼

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

# Conflicts:
#	public/version.json
lilei 2 年之前
父節點
當前提交
42a32731cb

+ 1 - 1
public/version.json

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

+ 6 - 6
src/views/chainReportData/chainCallReport/detailList.vue

@@ -25,13 +25,13 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="连锁调出单号">
-              <a-input id="chainCallReportExport-allocationLinkageOutNo" v-model.trim="queryParam.allocationLinkageOutNo" allowClear placeholder="请输入连锁调单号"/>
+              <a-input id="chainCallReportExport-allocationLinkageOutNo" v-model.trim="queryParam.allocationLinkageOutNo" allowClear placeholder="请输入连锁调单号"/>
             </a-form-model-item>
           </a-col>
           <template v-if="advanced">
-            <a-col :md="4" :sm="24">
-              <a-form-item label="调对象">
-                <outTenant id="chainCallReportExport-putTenantSn" v-model="queryParam.putTenantSn"></outTenant>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="调对象">
+                <outTenant id="chainCallReportExport-putTenantSn" v-model="queryParam.putTenantSn" placeholder="请选择调往对象"></outTenant>
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
@@ -91,7 +91,7 @@
       <div class="ftext" slot="message">
         产品总数量:<strong>{{ (totalData && (totalData.outQty || totalData.outQty==0)) ? totalData.outQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          调总成本:<strong>{{ (totalData && (totalData.outCost || totalData.outCost==0)) ? toThousands(totalData.outCost) : '--' }}</strong>;
+          调总成本:<strong>{{ (totalData && (totalData.outCost || totalData.outCost==0)) ? toThousands(totalData.outCost) : '--' }}</strong>;
         </div>
       </div>
     </a-alert>
@@ -185,7 +185,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '连锁调出单号', dataIndex: 'allocationLinkageOutNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调对象', dataIndex: 'putTenantName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调对象', dataIndex: 'putTenantName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productEntity.name', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'productEntity.unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },

+ 5 - 5
src/views/chainReportData/chainCallReport/list.vue

@@ -29,9 +29,9 @@
             </a-form-model-item>
           </a-col>
           <template v-if="advanced">
-            <a-col :md="4" :sm="24">
-              <a-form-item label="调对象">
-                <outTenant id="chainCallReportExport-putTenantSn" v-model="queryParam.putTenantSn"></outTenant>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="调对象">
+                <outTenant id="chainCallReportExport-putTenantSn" v-model="queryParam.putTenantSn" placeholder="请选择调往对象"></outTenant>
               </a-form-item>
             </a-col>
              <a-col :md="4" :sm="24">
@@ -72,7 +72,7 @@
         总单数:<strong>{{ (totalData && (totalData.totalCount || totalData.totalCount==0)) ? totalData.totalCount : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          调总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? toThousands(totalData.productTotalCost) : '--' }}</strong>;
+          调总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? toThousands(totalData.productTotalCost) : '--' }}</strong>;
         </div>
       </div>
     </a-alert>
@@ -154,7 +154,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '连锁调出单号', dataIndex: 'allocationLinkageOutNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调对象', dataIndex: 'putTenantName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '调对象', dataIndex: 'putTenantName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '款数', dataIndex: 'productTotalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '数量', dataIndex: 'productTotalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '出库时间', dataIndex: 'outWarehouseTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },

+ 1 - 1
src/views/chainReportData/chainCallReport/outTenant.js

@@ -1,4 +1,4 @@
-import { getReportTenantList } from '@/api/allocLinkagePut'
+import { getReportTenantList } from '@/api/allocLinkageOut'
 // 调出对象
 const SettleStyle = {
   template: `

+ 1 - 1
src/views/chainReportData/chainTransferReport/outTenant.js

@@ -1,4 +1,4 @@
-import { getReportTenantList } from '@/api/allocLinkageOut'
+import { getReportTenantList } from '@/api/allocLinkagePut'
 // 调出对象
 const SettleStyle = {
   template: `