Bladeren bron

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

lilei 1 jaar geleden
bovenliggende
commit
54d3866456

+ 75 - 69
src/views/allocationManagement/transferOut/detail.vue

@@ -7,11 +7,15 @@
           <a id="allocateBillDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <a-button
             v-if="isEdit"
-            type="primary"
-            size="small"
-            style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
+            type="link"
+            class="button-default"
             id="allocateBillDetail-edit-btn"
-            @click.stop="handleEdit">编辑</a-button>
+            @click.stop="handleEdit">
+            <a-icon type="edit"/>编辑
+          </a-button>
+          <a-button type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
@@ -50,68 +54,69 @@
             @click="handlePrint('dbflExport')">调拨分类导出</a-button>
         </template>
       </a-page-header>
-      <a-card size="small" :bordered="false" class="allocateBillDetail-cont">
-        <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" header="基础信息">
-            <a-descriptions :column="4">
-              <a-descriptions-item label="调往对象">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="调出仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="发货编号">{{ (basicInfoData&&basicInfoData.sendNo) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="收货客户名称">{{ (basicInfoData&&basicInfoData.receiverName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="调拨单号">{{ (basicInfoData&&basicInfoData.allocateNo) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="打印状态">{{ (basicInfoData&&basicInfoData.printStateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="费用类型">
-                {{ (basicInfoData&&basicInfoData.costTypeName) || '--' }}
-              </a-descriptions-item>
-              <a-descriptions-item label="调拨类型">
-                <div>
-                  <span v-if="basicInfoData&&basicInfoData.allocateSortName">{{ basicInfoData.allocateSortName || '--' }}</span>
-                  <span v-if="basicInfoData&&basicInfoData.allocateTypeName">/{{ basicInfoData.allocateTypeName || '--' }}</span>
-                </div>
-              </a-descriptions-item>
-              <a-descriptions-item label="费用归属品牌">
-                {{ (basicInfoData&&basicInfoData.productBrandName) || '--' }}
-              </a-descriptions-item>
-              <a-descriptions-item label="费用归属品类">
-                <div>
-                  <span v-if="basicInfoData&&basicInfoData.productTypeName1">{{ basicInfoData.productTypeName1 || '--' }}</span>
-                  <span v-else>--</span>
-                  <span v-if="basicInfoData&&basicInfoData.productTypeName2">/{{ basicInfoData.productTypeName2 || '--' }}</span>
-                  <span v-if="basicInfoData&&basicInfoData.productTypeName3">/{{ basicInfoData.productTypeName3 || '--' }}</span>
-                </div>
-              </a-descriptions-item>
-              <a-descriptions-item label="起止时间">
-                <span v-if="basicInfoData&&(basicInfoData.promoStartDate || basicInfoData.promoEndDate)">{{ (basicInfoData&&basicInfoData.promoStartDate) || '--' }} ~ {{ (basicInfoData&&basicInfoData.promoEndDate) || '--' }}</span>
-                <span v-else>--</span>
-              </a-descriptions-item>
-              <a-descriptions-item label="备注">{{ (basicInfoData&&basicInfoData.remark) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="附件" :span="3">
-                <div v-if="basicInfoData&&basicInfoData.attachmentList&&basicInfoData.attachmentList.length">
-                  <a
-                    target="_blank"
-                    style="color: #00aaff;text-decoration: underline;margin-right: 15px;"
-                    :href="item.filePath"
-                    v-for="item in basicInfoData.attachmentList"
-                    :key="item.id">
-                    {{ item.fileName }}
-                  </a>
-                </div>
+      <!-- 基础信息 -->
+      <a-card size="small" :bordered="false" class="allocateBillDetail-cont" v-show="showDetail">
+        <div style="padding: 0;" ref="basicInformation">
+          <a-descriptions :column="4">
+            <a-descriptions-item label="调往对象">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="调出仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="发货编号">{{ (basicInfoData&&basicInfoData.sendNo) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收货客户名称">{{ (basicInfoData&&basicInfoData.receiverName) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="调拨单号">{{ (basicInfoData&&basicInfoData.allocateNo) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="打印状态">{{ (basicInfoData&&basicInfoData.printStateDictValue) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="费用类型">
+              {{ (basicInfoData&&basicInfoData.costTypeName) || '--' }}
+            </a-descriptions-item>
+            <a-descriptions-item label="调拨类型">
+              <div>
+                <span v-if="basicInfoData&&basicInfoData.allocateSortName">{{ basicInfoData.allocateSortName || '--' }}</span>
+                <span v-if="basicInfoData&&basicInfoData.allocateTypeName">/{{ basicInfoData.allocateTypeName || '--' }}</span>
+              </div>
+            </a-descriptions-item>
+            <a-descriptions-item label="费用归属品牌">
+              {{ (basicInfoData&&basicInfoData.productBrandName) || '--' }}
+            </a-descriptions-item>
+            <a-descriptions-item label="费用归属品类">
+              <div>
+                <span v-if="basicInfoData&&basicInfoData.productTypeName1">{{ basicInfoData.productTypeName1 || '--' }}</span>
                 <span v-else>--</span>
-              </a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+                <span v-if="basicInfoData&&basicInfoData.productTypeName2">/{{ basicInfoData.productTypeName2 || '--' }}</span>
+                <span v-if="basicInfoData&&basicInfoData.productTypeName3">/{{ basicInfoData.productTypeName3 || '--' }}</span>
+              </div>
+            </a-descriptions-item>
+            <a-descriptions-item label="起止时间">
+              <span v-if="basicInfoData&&(basicInfoData.promoStartDate || basicInfoData.promoEndDate)">{{ (basicInfoData&&basicInfoData.promoStartDate) || '--' }} ~ {{ (basicInfoData&&basicInfoData.promoEndDate) || '--' }}</span>
+              <span v-else>--</span>
+            </a-descriptions-item>
+            <a-descriptions-item label="备注" :span="4">{{ (basicInfoData&&basicInfoData.remark) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="附件" :span="4">
+              <div v-if="basicInfoData&&basicInfoData.attachmentList&&basicInfoData.attachmentList.length">
+                <a
+                  target="_blank"
+                  style="color: #00aaff;text-decoration: underline;margin-right: 15px;"
+                  :href="item.filePath"
+                  v-for="item in basicInfoData.attachmentList"
+                  :key="item.id">
+                  {{ item.fileName }}
+                </a>
+              </div>
+              <span v-else>--</span>
+            </a-descriptions-item>
+          </a-descriptions>
+        </div>
       </a-card>
       <a-card size="small" :bordered="false" class="allocateBillDetail-cont">
         <!-- 总计 -->
-        <a-alert type="info" style="margin-bottom:10px">
-          <div slot="message">
-            总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ;
-            <span v-if="$hasPermissions('M_transferOut_detail_costPrice')||$hasPermissions('M_tfoPrint_detail_costPrice')||$hasPermissions('M_mso_detail_costPrice')">总成本:<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? toThousands(productTotal.totalCost) : '--' }}</strong> ;</span>
-            <span v-if="$hasPermissions('M_transferOut_detail_salesPrice')||$hasPermissions('M_tfoPrint_detail_salesPrice')||$hasPermissions('M_mso_detail_salesPrice')">总售价:<strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong>;</span>
-          </div>
-        </a-alert>
+        <div ref="countInfo">
+          <a-alert type="info" style="margin-bottom:10px">
+            <div slot="message">
+              总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ;
+              <span v-if="$hasPermissions('M_transferOut_detail_costPrice')||$hasPermissions('M_tfoPrint_detail_costPrice')||$hasPermissions('M_mso_detail_costPrice')">总成本:<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? toThousands(productTotal.totalCost) : '--' }}</strong> ;</span>
+              <span v-if="$hasPermissions('M_transferOut_detail_salesPrice')||$hasPermissions('M_tfoPrint_detail_salesPrice')||$hasPermissions('M_mso_detail_salesPrice')">总售价:<strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong>;</span>
+            </div>
+          </a-alert>
+        </div>
         <!-- 列表 -->
         <s-table
           class="sTable"
@@ -176,7 +181,8 @@ export default {
       productTotal: null, //  合计
       localDataSource: [],
       openModal: false,
-      nowType: null
+      nowType: null,
+      showDetail: false
     }
   },
   computed: {
@@ -187,18 +193,18 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productEntity.name', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productEntity.name', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productEntity.origCode', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productEntity.unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调出数量', dataIndex: 'qty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
-      if (this.$hasPermissions('M_transferOut_detail_costPrice')||this.$hasPermissions('M_tfoPrint_detail_salesPrice')||this.$hasPermissions('M_mso_detail_costPrice')) { // 成本价权限
+      if (this.$hasPermissions('M_transferOut_detail_costPrice') || this.$hasPermissions('M_tfoPrint_detail_salesPrice') || this.$hasPermissions('M_mso_detail_costPrice')) { // 成本价权限
         arr.splice(5, 0, { title: '成本价', dataIndex: 'cost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(8, 0, { title: '成本小计', dataIndex: 'totalCost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      if (this.$hasPermissions('M_transferOut_detail_salesPrice')||this.$hasPermissions('M_tfoPrint_detail_salesPrice')||this.$hasPermissions('M_mso_detail_salesPrice')) { //  售价权限
-        const ind = this.$hasPermissions('M_transferOut_detail_costPrice')||this.$hasPermissions('M_tfoPrint_detail_costPrice') ? 6 : 5
+      if (this.$hasPermissions('M_transferOut_detail_salesPrice') || this.$hasPermissions('M_tfoPrint_detail_salesPrice') || this.$hasPermissions('M_mso_detail_salesPrice')) { //  售价权限
+        const ind = this.$hasPermissions('M_transferOut_detail_costPrice') || this.$hasPermissions('M_tfoPrint_detail_costPrice') ? 6 : 5
         arr.splice(ind, 0, { title: '售价', dataIndex: 'price', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(ind + 3, 0, { title: '售价小计', dataIndex: 'totalPrice', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
@@ -291,7 +297,7 @@ export default {
       this.pageInit()
     }
   },
-  deactivated(){
+  deactivated () {
     this.$store.state.app.curActionPermission = ''
   },
   beforeRouteEnter (to, from, next) {

+ 62 - 60
src/views/allocationManagement/transferOut/edit.vue

@@ -5,6 +5,9 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="allocateBillEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a-button type="link" class="button-default" @click="showDetail=!showDetail">
+            <a-icon :type="showDetail ? 'eye-invisible' : 'eye'"/> {{ showDetail?'隐藏':'查看' }}信息
+          </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
@@ -43,63 +46,61 @@
             @click="handlePrint('dbflExport')">调拨分类导出</a-button>
         </template>
       </a-page-header>
-      <a-card size="small" :bordered="false" v-if="basicInfoData" class="allocateBillEdit-cont">
-        <a-collapse :activeKey="['0']">
-          <a-collapse-panel key="0" header="基础信息">
-            <a-descriptions :column="4">
-              <a-descriptions-item label="调往对象">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="调出仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="发货编号">{{ (basicInfoData&&basicInfoData.sendNo) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="收货客户名称">{{ (basicInfoData&&basicInfoData.receiverName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="调拨单号">{{ (basicInfoData&&basicInfoData.allocateNo) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="打印状态">{{ (basicInfoData&&basicInfoData.printStateDictValue) || '--' }}</a-descriptions-item>
-            </a-descriptions>
-            <a-divider>以下信息可修改,请点击<span style="color: dodgerblue;font-size: 14px;cursor: pointer;" @click="editRemark = true" ><a-icon type="form" title="编辑基础信息" />编辑</span></a-divider>
-            <a-descriptions :column="4">
-              <a-descriptions-item label="费用类型">
-                {{ (basicInfoData&&basicInfoData.costTypeName) || '--' }}
-              </a-descriptions-item>
-              <a-descriptions-item label="调拨类型">
-                <div>
-                  <span v-if="basicInfoData.allocateSortName">{{ basicInfoData.allocateSortName || '--' }}</span>
-                  <span v-if="basicInfoData.allocateTypeName">/{{ basicInfoData.allocateTypeName || '--' }}</span>
-                </div>
-              </a-descriptions-item>
-              <a-descriptions-item label="费用归属品牌">
-                {{ (basicInfoData&&basicInfoData.productBrandName) || '--' }}
-              </a-descriptions-item>
-              <a-descriptions-item label="费用归属品类">
-                <div>
-                  <span v-if="basicInfoData.productTypeName1">{{ basicInfoData.productTypeName1 || '--' }}</span>
-                  <span v-else>--</span>
-                  <span v-if="basicInfoData.productTypeName2">/{{ basicInfoData.productTypeName2 || '--' }}</span>
-                  <span v-if="basicInfoData.productTypeName3">/{{ basicInfoData.productTypeName3 || '--' }}</span>
-                </div>
-              </a-descriptions-item>
-              <a-descriptions-item label="起止时间">
-                <span v-if="basicInfoData&&(basicInfoData.promoStartDate || basicInfoData.promoEndDate)">{{ (basicInfoData&&basicInfoData.promoStartDate) || '--' }} ~ {{ (basicInfoData&&basicInfoData.promoEndDate) || '--' }}</span>
-                <span v-else>--</span>
-              </a-descriptions-item>
-              <a-descriptions-item label="备注" :span="3">
-                {{ (basicInfoData&&basicInfoData.remark||'--') }}
-              </a-descriptions-item>
-              <a-descriptions-item label="附件" :span="4">
-                <div v-if="basicInfoData&&basicInfoData.attachmentList&&basicInfoData.attachmentList.length">
-                  <a
-                    target="_blank"
-                    style="color: #00aaff;text-decoration: underline;margin-right: 15px;"
-                    :href="item.filePath"
-                    v-for="item in basicInfoData.attachmentList"
-                    :key="item.id">
-                    {{ item.fileName }}
-                  </a>
-                </div>
+      <a-card size="small" :bordered="false" v-if="basicInfoData&&showDetail" class="allocateBillEdit-cont">
+        <div>
+          <a-descriptions :column="4">
+            <a-descriptions-item label="调往对象">{{ (basicInfoData&&basicInfoData.targetName) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="调出仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="发货编号">{{ (basicInfoData&&basicInfoData.sendNo) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="收货客户名称">{{ (basicInfoData&&basicInfoData.receiverName) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="调拨单号">{{ (basicInfoData&&basicInfoData.allocateNo) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="业务状态">{{ (basicInfoData&&basicInfoData.stateDictValue) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="打印状态">{{ (basicInfoData&&basicInfoData.printStateDictValue) || '--' }}</a-descriptions-item>
+          </a-descriptions>
+          <a-divider>以下信息可修改,请点击<span style="color: dodgerblue;font-size: 14px;cursor: pointer;" @click="editRemark = true" ><a-icon type="form" title="编辑基础信息" />编辑</span></a-divider>
+          <a-descriptions :column="4">
+            <a-descriptions-item label="费用类型">
+              {{ (basicInfoData&&basicInfoData.costTypeName) || '--' }}
+            </a-descriptions-item>
+            <a-descriptions-item label="调拨类型">
+              <div>
+                <span v-if="basicInfoData.allocateSortName">{{ basicInfoData.allocateSortName || '--' }}</span>
+                <span v-if="basicInfoData.allocateTypeName">/{{ basicInfoData.allocateTypeName || '--' }}</span>
+              </div>
+            </a-descriptions-item>
+            <a-descriptions-item label="费用归属品牌">
+              {{ (basicInfoData&&basicInfoData.productBrandName) || '--' }}
+            </a-descriptions-item>
+            <a-descriptions-item label="费用归属品类">
+              <div>
+                <span v-if="basicInfoData.productTypeName1">{{ basicInfoData.productTypeName1 || '--' }}</span>
                 <span v-else>--</span>
-              </a-descriptions-item>
-            </a-descriptions>
-          </a-collapse-panel>
-        </a-collapse>
+                <span v-if="basicInfoData.productTypeName2">/{{ basicInfoData.productTypeName2 || '--' }}</span>
+                <span v-if="basicInfoData.productTypeName3">/{{ basicInfoData.productTypeName3 || '--' }}</span>
+              </div>
+            </a-descriptions-item>
+            <a-descriptions-item label="起止时间">
+              <span v-if="basicInfoData&&(basicInfoData.promoStartDate || basicInfoData.promoEndDate)">{{ (basicInfoData&&basicInfoData.promoStartDate) || '--' }} ~ {{ (basicInfoData&&basicInfoData.promoEndDate) || '--' }}</span>
+              <span v-else>--</span>
+            </a-descriptions-item>
+            <a-descriptions-item label="备注" :span="3">
+              {{ (basicInfoData&&basicInfoData.remark||'--') }}
+            </a-descriptions-item>
+            <a-descriptions-item label="附件" :span="4">
+              <div v-if="basicInfoData&&basicInfoData.attachmentList&&basicInfoData.attachmentList.length">
+                <a
+                  target="_blank"
+                  style="color: #00aaff;text-decoration: underline;margin-right: 15px;"
+                  :href="item.filePath"
+                  v-for="item in basicInfoData.attachmentList"
+                  :key="item.id">
+                  {{ item.fileName }}
+                </a>
+              </div>
+              <span v-else>--</span>
+            </a-descriptions-item>
+          </a-descriptions>
+        </div>
       </a-card>
       <!-- 选择产品 -->
       <a-card size="small" :bordered="false" class="allocateBillEdit-cont">
@@ -368,6 +369,7 @@ export default {
       showDsModal: false,
       editRemark: false,
       showPlModal: false,
+      showDetail: true, // 基础信息
       queryParam: {
         productCode: '',
         productName: '',
@@ -438,8 +440,8 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', align: 'center', width: '26%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', align: 'left', width: '26%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         // { title: '成本价', dataIndex: 'lastStockCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '售价', dataIndex: 'productPrice', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -461,8 +463,8 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productEntity.name', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品编码', dataIndex: 'productEntity.code', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productEntity.name', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productEntity.origCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         // { title: '成本价', dataIndex: 'cost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '售价', scopedSlots: { customRender: 'price' }, width: '10%', align: 'center' },

+ 92 - 88
src/views/allocationManagement/transferOut/list.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-card size="small" :bordered="false" class="allocateBillList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="allocateBillList-wrap">
       <!-- 搜索条件 -->
       <div ref="tableSearch" class="table-page-search-wrapper">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -98,95 +98,99 @@
           </a-row>
         </a-form>
       </div>
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button v-if="$hasPermissions('B_transferOut_add')" id="allocateBillList-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :defaultLoadData="false"
-        :scroll="{ y: tableHeight }"
-        bordered>
-        <!-- 单号 -->
-        <template slot="allocateNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('M_transferOut_detail')" class="link-bule" @click="handleDetail(record)">{{ record.allocateNo }}</span>
-          <span v-else>{{ record.allocateNo }}</span>
-        </template>
-        <!-- 起止时间 -->
-        <template slot="promoDate" slot-scope="text, record">
-          <span v-if="record.promoStartDate || record.promoEndDate">{{ record.promoStartDate }} ~ {{ record.promoEndDate }}</span>
-          <span v-else>--</span>
-        </template>
-        <!-- 调拨类型 -->
-        <template slot="allocateType" slot-scope="text, record">
-          <div>
-            <span v-if="record.allocateSortName">{{ record.allocateSortName }}</span>
-            <span v-if="record.allocateSortName&&record.allocateTypeName">/</span>
-            <span v-if="record.allocateTypeName">{{ record.allocateTypeName }}</span>
-          </div>
-        </template>
-        <!-- 打印状态 -->
-        <template slot="printStateWord" slot-scope="text, record">
-          <span v-if="record.printState">
-            <span v-if="record.printState=='NO_PRINT'||record.printState=='PRINT'">{{ record.printStateDictValue }}</span>
-            <span @click="handlePrint(record)" class="link-bule" v-else>{{ record.printStateDictValue }}</span>
-          </span>
-          <span v-else>--</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
-          <!-- <a-button
+    </a-card>
+    <a-card size="small" :bordered="false" style="margin-top:6px;">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button v-if="$hasPermissions('B_transferOut_add')" id="allocateBillList-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :defaultLoadData="false"
+          :scroll="{ y: tableHeight }"
+          bordered>
+          <!-- 单号 -->
+          <template slot="allocateNo" slot-scope="text, record">
+            <span v-if="$hasPermissions('M_transferOut_detail')" class="link-bule" @click="handleDetail(record)">{{ record.allocateNo }}</span>
+            <span v-else>{{ record.allocateNo }}</span>
+          </template>
+          <!-- 起止时间 -->
+          <template slot="promoDate" slot-scope="text, record">
+            <span v-if="record.promoStartDate || record.promoEndDate">{{ record.promoStartDate }} ~ {{ record.promoEndDate }}</span>
+            <span v-else>--</span>
+          </template>
+          <!-- 调拨类型 -->
+          <template slot="allocateType" slot-scope="text, record">
+            <div>
+              <span v-if="record.allocateSortName">{{ record.allocateSortName }}</span>
+              <span v-if="record.allocateSortName&&record.allocateTypeName">/</span>
+              <span v-if="record.allocateTypeName">{{ record.allocateTypeName }}</span>
+            </div>
+          </template>
+          <!-- 打印状态 -->
+          <template slot="printStateWord" slot-scope="text, record">
+            <span v-if="record.printState">
+              <span v-if="record.printState=='NO_PRINT'||record.printState=='PRINT'">{{ record.printStateDictValue }}</span>
+              <span @click="handlePrint(record)" class="link-bule" v-else>{{ record.printStateDictValue }}</span>
+            </span>
+            <span v-else>--</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <!-- <a-button
             size="small"
             type="link"
             v-if="record.state == 'WAIT_AUDIT' && record.printState!='UNABLE_PRINT' && record.printState!='NO_PRINT' && $hasPermissions('B_tfo_yxPrint')"
             class="button-warning"
             @click="handleYxPrint(record)"
             id="allocateBillList-examine-btn">允许打印</a-button> -->
-          <a-button
-            size="small"
-            type="link"
-            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_transferOut_audit')"
-            class="button-warning"
-            @click="handleExamine(record)"
-            id="allocateBillList-examine-btn">审核</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('M_transferOut_edit')"
-            class="button-info"
-            @click="handleEdit(record)"
-            id="allocateBillList-edit-btn">编辑</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferOut_del')"
-            class="button-error"
-            @click="handleDel(record)"
-            id="allocateBillList-del-btn">删除</a-button>
-          <span v-if="((record.state != 'WAIT_SUBMIT') && (record.state != 'WAIT_AUDIT') && (record.state != 'AUDIT_REJECT'))||(!$hasPermissions('B_transferOut_audit') && !$hasPermissions('M_transferOut_edit') && !$hasPermissions('B_transferOut_del'))">--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 新增 -->
-    <basic-info-modal v-drag :openModal="openModal" @ok="handleOk" @close="openModal=false" />
-    <!-- 审核 -->
-    <auditModal
-      v-drag
-      :openModal="visibleAudit"
-      :spinning="spinningAudit"
-      @close="visibleAudit=false"
-      @ok="auditOrder('WAIT_OUT_WAREHOUSE')"
-      @fail="auditOrder('AUDIT_REJECT')" />
-    <!-- 打印状态 -->
-    <printModal v-drag :show="printIsShow" :info="printInfo" @cancel="cancelModal"></printModal>
-  </a-card>
+            <a-button
+              size="small"
+              type="link"
+              v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_transferOut_audit')"
+              class="button-warning"
+              @click="handleExamine(record)"
+              id="allocateBillList-examine-btn">审核</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('M_transferOut_edit')"
+              class="button-info"
+              @click="handleEdit(record)"
+              id="allocateBillList-edit-btn">编辑</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="((record.state == 'WAIT_SUBMIT') || (record.state == 'WAIT_AUDIT') || (record.state == 'AUDIT_REJECT')) && $hasPermissions('B_transferOut_del')"
+              class="button-error"
+              @click="handleDel(record)"
+              id="allocateBillList-del-btn">删除</a-button>
+            <span v-if="((record.state != 'WAIT_SUBMIT') && (record.state != 'WAIT_AUDIT') && (record.state != 'AUDIT_REJECT'))||(!$hasPermissions('B_transferOut_audit') && !$hasPermissions('M_transferOut_edit') && !$hasPermissions('B_transferOut_del'))">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 新增 -->
+      <basic-info-modal v-drag :openModal="openModal" @ok="handleOk" @close="openModal=false" />
+      <!-- 审核 -->
+      <auditModal
+        v-drag
+        :openModal="visibleAudit"
+        :spinning="spinningAudit"
+        @close="visibleAudit=false"
+        @ok="auditOrder('WAIT_OUT_WAREHOUSE')"
+        @fail="auditOrder('AUDIT_REJECT')" />
+      <!-- 打印状态 -->
+      <printModal v-drag :show="printIsShow" :info="printInfo" @cancel="cancelModal"></printModal>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -238,7 +242,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return allocateBillList(Object.assign(parameter, this.queryParam, {authWarehouseFlag:1})).then(res => {
+        return allocateBillList(Object.assign(parameter, this.queryParam, { authWarehouseFlag: 1 })).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -268,7 +272,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '10%' },
         { title: '起止时间', scopedSlots: { customRender: 'promoDate' }, align: 'center', width: '6%' },
-        { title: '调往对象', dataIndex: 'targetName', width: '9%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '调往对象', dataIndex: 'targetName', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户类型', dataIndex: 'dealerLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货说明', dataIndex: 'explainInfo', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -439,7 +443,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 242
+      this.tableHeight = window.innerHeight - tableSearchH - 266
     },
     handlePrint (item) {
       const obj = {

+ 90 - 76
src/views/allocationManagement/transfersPrint/list.vue

@@ -8,89 +8,103 @@
         </a-tab-pane>
       </a-tabs>
     </div>
-    <a-card size="small" :bordered="false">
-      <a-spin :spinning="spinning" tip="Loading...">
-        <!-- 搜索条件 -->
-        <div ref="tableSearch" class="table-page-search-wrapper">
-          <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-            <a-row :gutter="15">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="创建时间">
-                  <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+    <a-card size="small" :bordered="false" style="margin-bottom: 6px;">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="创建时间">
+                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="调往对象">
+                <a-input id="allocateBillList-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调往对象"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="收货客户名称">
+                <dealerSearchList ref="receiverSn" @change="custChange"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24" v-if="currentTab==2">
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.state"
+                  ref="state"
+                  id="allocateBillList-state"
+                  code="ALLOCATE_STATUS"
+                  placeholder="请选择业务状态"
+                  allowClear
+                ></v-select>
+              </a-form-item>
+            </a-col>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24" v-if="currentTab==1">
+                <a-form-item label="业务状态">
+                  <v-select
+                    v-model="queryParam.state"
+                    ref="state"
+                    id="allocateBillList-state"
+                    code="ALLOCATE_STATUS"
+                    placeholder="请选择业务状态"
+                    allowClear
+                  ></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="调往对象">
-                  <a-input id="allocateBillList-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调往对象"/>
+                <a-form-item label="调拨单号">
+                  <a-input id="allocateBillList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24" v-if="currentTab == 1">
+                <a-form-item label="打印状态">
+                  <v-select
+                    v-model="queryParam.printState"
+                    ref="printState"
+                    id="allocateBillList-printState"
+                    code="PRINT_STATUS"
+                    placeholder="请选择打印状态"
+                    allowClear
+                  ></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowWarehouse">
+                <a-form-item label="调出仓库">
+                  <warehouse
+                    v-model="queryParam.warehouseSn"
+                    isPermission
+                    id="allocateBillList-warehouseSn"
+                    placeholder="请选择调出仓库"
+                  />
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="收货客户名称">
-                  <dealerSearchList ref="receiverSn" @change="custChange"/>
+                <a-form-item label="所在区域">
+                  <subarea id="allocateBillList-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-item>
               </a-col>
-              <template v-if="advanced">
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="业务状态">
-                    <v-select
-                      v-model="queryParam.state"
-                      ref="state"
-                      id="allocateBillList-state"
-                      code="ALLOCATE_STATUS"
-                      placeholder="请选择业务状态"
-                      allowClear
-                    ></v-select>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="调拨单号">
-                    <a-input id="allocateBillList-allocateNo" v-model.trim="queryParam.allocateNo" allowClear placeholder="请输入调拨单号"/>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24" v-if="currentTab == 1">
-                  <a-form-item label="打印状态">
-                    <v-select
-                      v-model="queryParam.printState"
-                      ref="printState"
-                      id="allocateBillList-printState"
-                      code="PRINT_STATUS"
-                      placeholder="请选择打印状态"
-                      allowClear
-                    ></v-select>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24" v-show="isShowWarehouse">
-                  <a-form-item label="调出仓库">
-                    <warehouse
-                      v-model="queryParam.warehouseSn"
-                      isPermission
-                      id="allocateBillList-warehouseSn"
-                      placeholder="请选择调出仓库"
-                    />
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="所在区域">
-                    <subarea id="allocateBillList-subarea" ref="subarea" @change="subareaChange"></subarea>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="地区">
-                    <Area id="allocateBillList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
-                  </a-form-item>
-                </a-col>
-              </template>
               <a-col :md="6" :sm="24">
-                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
-                <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocateBillList-reset">重置</a-button>
-                <a @click="advanced=!advanced" style="margin-left: 5px">
-                  {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'"/>
-                </a>
+                <a-form-item label="地区">
+                  <Area id="allocateBillList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
+                </a-form-item>
               </a-col>
-            </a-row>
-          </a-form>
-        </div>
+            </template>
+            <a-col :md="currentTab==2?24:6" :sm="24" :style="{textAlign: currentTab==2?'center':''}">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocateBillList-reset">重置</a-button>
+              <a @click="advanced=!advanced" style="margin-left: 5px">
+                {{ advanced ? '收起' : '展开' }}
+                <a-icon :type="advanced ? 'up' : 'down'"/>
+              </a>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <a-card size="small" :bordered="false">
+      <a-spin :spinning="spinning" tip="Loading...">
         <!-- 列表 -->
         <s-table
           class="sTable fixPagination"
@@ -258,7 +272,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '8%' },
-        { title: '调往对象', dataIndex: 'targetName', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '调往对象', dataIndex: 'targetName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货编号', dataIndex: 'sendNo', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '发货说明', dataIndex: 'explainInfo', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
@@ -375,8 +389,8 @@ export default {
       this.showDetailModal = true
     },
     cancelDetail () {
-      this.$store.state.app.curActionPermission = ''
       this.showDetailModal = false
+      this.$store.state.app.curActionPermission = ''
       this.bizSn = null
     },
     pageInit () {
@@ -388,7 +402,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 246
+      this.tableHeight = window.innerHeight - tableSearchH - 266
     },
     // 状态打印弹窗
     editPrintStatus (item) {