Browse Source

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

lilei 4 years ago
parent
commit
11896090ca

+ 31 - 0
src/api/stockOut.js

@@ -19,3 +19,34 @@ export const stockOutOut = (params) => {
     method: 'post'
   })
 }
+//  出库 详情
+export const stockOutDetail = (params) => {
+  const url = `/stockOut/queryDetailHeadInfoBySn/${params.sn}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+//  出库 详情 列表 有分页
+export const stockOutDetailList = (params) => {
+  const url = `/stockOut/queryDetailPageBySn/${params.sn}/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+//  出库 详情 合计
+export const stockOutDetailCount = (params) => {
+  const url = `/stockOut/queryDetailPageCountBySn/${params.sn}`
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 1 - 1
src/components/UploadFile/index.vue

@@ -19,7 +19,7 @@
         <a-button> <a-icon type="upload" /> {{ upText }} </a-button>
       </div>
     </a-upload>
-    <a-modal :visible="previewVisible" :footer="null" @cancel="handleCancel">
+    <a-modal :visible="previewVisible" :footer="null" centered :maskClosable="false" @cancel="handleCancel">
       <video v-if="fileType=='video/mp4'" controls="controls" style="width: 100%" :src="previewImage" />
       <img v-else alt="example" style="width: 100%" :src="previewImage" />
     </a-modal>

+ 2 - 2
src/views/allocationManagement/transferOut/list.vue

@@ -120,7 +120,7 @@
         <span v-if="(record.state != 'WAIT_SUBMIT') && (record.state != 'WAIT_AUDIT') && (record.state != 'WAIT_OUT_WAREHOUSE')">--</span>
       </template>
     </s-table>
-    <!-- 新增/编辑 -->
+    <!-- 新增 -->
     <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
   </a-card>
 </template>
@@ -262,7 +262,7 @@ export default {
     handleDetail (row) {
       this.$router.push({ path: `/allocationManagement/transferOut/detail/${row.storeCallOutSn}` })
     },
-    //  新增/编辑
+    //  编辑
     handleEdit (row) {
       this.$router.push({ path: `/allocationManagement/transferOut/edit/${row.id}/${row.storeCallOutSn}` })
     },

+ 12 - 5
src/views/productManagement/priceChangeRecord/list.vue

@@ -79,7 +79,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 2140 }"
+      :scroll="{ x: 2140, y: tableHeight }"
       bordered>
       <!-- 产品分类 -->
       <template slot="productType" slot-scope="text, record">
@@ -127,6 +127,7 @@ export default {
   data () {
     return {
       advanced: false, // 高级搜索 展开/关闭
+      tableHeight: 0,
       queryParam: { //  查询条件
         name: '', //  产品名称
         code: '', //  产品编码
@@ -206,6 +207,9 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        if (this.tableHeight == 0) {
+          this.tableHeight = window.innerHeight - 430
+        }
         // 变更时间
         if (this.time && this.time.length > 0) {
           this.queryParam.beginDate = moment(this.time[0]).format(this.dateFormat)
@@ -235,13 +239,16 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.queryParam.productCode = ''
-      this.queryParam.productName = ''
-      this.queryParam.productBrandSn = undefined
+      this.queryParam.code = ''
+      this.queryParam.name = ''
+      this.queryParam.brandSn = undefined
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''
-      this.queryParam.enabledFlag = undefined
+      this.time = [
+        moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
+        moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
+      ]
       this.$refs.table.refresh(true)
     },
     // 审核

+ 7 - 6
src/views/productManagement/productBrand/detailModal.vue

@@ -10,12 +10,12 @@
     width="80%">
     <div v-if="detailsData">
       <a-descriptions bordered size="default" :column="1">
-        <a-descriptions-item label="品牌图片:">
-          <img :src="detailsData.imageUrl" title="点击查看大图" class="productPic" @click="getPreview(item.url)" />
-        </a-descriptions-item>
         <a-descriptions-item label="品牌名称:">{{ detailsData.brandName || '--' }}</a-descriptions-item>
         <a-descriptions-item label="品牌类别:">{{ detailsData.brandType || '--' }}</a-descriptions-item>
         <a-descriptions-item label="排序字母:">{{ detailsData.sortChar || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="品牌图片:">
+          <img :src="detailsData.imageUrl" title="点击查看大图" class="productPic" @click="getPreview(detailsData.imageUrl)" />
+        </a-descriptions-item>
         <a-descriptions-item label="品牌介绍:">
           <div v-if="detailsData.brandIntroduce" v-html="detailsData.brandIntroduce"></div>
           <span v-else>--</span>
@@ -23,8 +23,8 @@
       </a-descriptions>
       <div class="btn-cont"><a-button id="productBrandDetail-modal-back" @click="isShow = false">返回列表</a-button></div>
     </div>
-    <a-modal :visible="previewVisible" :footer="null" @cancel="previewVisible=false">
-      <img alt="example" style="width: 100%" :src="previewImage" />
+    <a-modal :visible="previewVisible" :footer="null" centered :maskClosable="false" @cancel="previewVisible=false">
+      <img alt="example" style="width: 100%;" :src="previewImage" />
     </a-modal>
   </a-modal>
 </template>
@@ -95,7 +95,8 @@ export default {
     }
     .productPic{
       cursor: pointer;
-      width: 100px;
+      max-width: 100px;
+      max-height: 100px;
       margin-right: 10px;
     }
     .btn-cont {

+ 11 - 2
src/views/productManagement/productBrand/editModal.vue

@@ -40,7 +40,6 @@
             id="productBrandEdit-imageUrl"
             v-model="form.imageUrl"
             ref="imageUrl"
-            :fileSize="0.25"
             @change="changeHomeImage"
             listType="picture-card" ></Upload>
           <span class="upload-desc">说明:图片比例1:1,尺寸为120*120px,可上传1张。</span>
@@ -81,7 +80,7 @@ export default {
   },
   computed: {
     modalTit () {
-      return (this.itemId ? '编辑' : '新增') + '产品品牌'
+      return (this.itemSn ? '编辑' : '新增') + '产品品牌'
     }
   },
   data () {
@@ -122,6 +121,7 @@ export default {
         if (res.status == 200) {
           const data = res.data
           this.form = Object.assign(this.form, data)
+          this.$refs.imageUrl.setFileList(data.imageUrl)
           this.$refs.editor.setHtml(res.data.brandIntroduce)
         } else {
           this.$refs.ruleForm.resetFields()
@@ -134,6 +134,7 @@ export default {
       _this.$refs.ruleForm.validate(valid => {
         if (valid) {
           const formData = JSON.parse(JSON.stringify(_this.form))
+          formData.id = undefined
           formData.brandSn = _this.itemSn ? _this.itemSn : undefined
           productBrandSave(formData).then(res => {
             if (res.status == 200) {
@@ -165,6 +166,14 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
+        this.$refs.imageUrl.setFileList('')
+        this.$refs.editor.setHtml('')
+        this.$refs.ruleForm.resetFields()
+      }
+    },
+    itemSn (newValue, oldValue) {
+      if (this.isShow && newValue) {
+        this.getDetail()
       }
     }
   }

+ 9 - 3
src/views/productManagement/productBrand/list.vue

@@ -40,10 +40,11 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ y: tableHeight }"
       bordered>
       <!-- 产品图片 -->
-      <template slot="productPic" slot-scope="text, record">
-        <img :src="record.productPic" width="30" height="30" class="productPic" @click="lookPic(record.productPic)" />
+      <template slot="imageUrl" slot-scope="text, record">
+        <img :src="record.imageUrl" width="30" height="30" class="imageUrl" @click="lookPic(record.imageUrl)" />
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
@@ -87,6 +88,7 @@ export default {
   data () {
     return {
       sortCharList: dataList.sortCharList,
+      tableHeight: 0,
       queryParam: { //  查询条件
         brandName: '', //  品牌名称
         brandType: undefined,
@@ -96,7 +98,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
-        { title: '品牌图片', scopedSlots: { customRender: 'productPic' }, width: 140, align: 'center' },
+        { title: '品牌图片', scopedSlots: { customRender: 'imageUrl' }, width: 140, align: 'center' },
         { title: '品牌名称', dataIndex: 'brandName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '品牌分类', dataIndex: 'brandType', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '排序字母', dataIndex: 'sortChar', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
@@ -105,6 +107,9 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        if (this.tableHeight == 0) {
+          this.tableHeight = window.innerHeight - 380
+        }
         return productBrandList(Object.assign(parameter, this.queryParam)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -145,6 +150,7 @@ export default {
     // 查看图片
     lookPic (url) {
       this.nowPic = url
+      this.openPicModal = true
     },
     //  关闭弹框
     closeModal () {

+ 22 - 10
src/views/productManagement/productInfo/detailModal.vue

@@ -20,13 +20,12 @@
         <a-descriptions-item label="包装规格:">{{ detailsData.packQty || '--' }}{{ detailsData.packQtyUnit || '--' }}</a-descriptions-item>
         <a-descriptions-item label="箭冠产品:">{{ detailsData.arrowFalgDictValue || '--' }}</a-descriptions-item>
         <a-descriptions-item label="产品图片:" :span="2">
-          <img
-            v-for="(item,index) in fileList"
-            :key="index"
-            :src="item.url"
-            title="点击查看大图"
-            class="productPic"
-            @click="getPreview(item.url)" />
+          <div style="display: flex;">
+            <p class="pic-box" v-for="(item,index) in fileList" :key="index">
+              <img :src="item" title="点击查看大图" class="productPic" @click="getPreview(item)" />
+            </p>
+          </div>
+          <span v-if="fileList.length == 0">--</span>
         </a-descriptions-item>
         <a-descriptions-item label="单位:">{{ detailsData.unit || '--' }}</a-descriptions-item>
         <a-descriptions-item label="产品尺寸:">{{ detailsData.size || '--' }}</a-descriptions-item>
@@ -44,7 +43,7 @@
       </a-descriptions>
       <div class="btn-cont"><a-button id="product-management-detail-modal-back" @click="isShow = false">返回列表</a-button></div>
     </div>
-    <a-modal :visible="previewVisible" :footer="null" @cancel="previewVisible=false">
+    <a-modal :visible="previewVisible" :footer="null" centered :maskClosable="false" @cancel="previewVisible=false">
       <img alt="example" style="width: 100%" :src="previewImage" />
     </a-modal>
   </a-modal>
@@ -105,6 +104,7 @@ export default {
       productSnDetail({ sn: this.itemSn }).then(res => {
         if (res.status == 200) {
           this.detailsData = res.data
+          this.fileList = res.data.productMsg ? res.data.productMsg.split(',') : []
         } else {
           this.detailsData = null
         }
@@ -142,10 +142,22 @@ export default {
     .ant-modal-body {
       padding: 40px 40px 24px;
     }
-    .productPic{
-      cursor: pointer;
+    .pic-box{
       width: 100px;
+      height: 100px;
       margin-right: 10px;
+      display: inline-flex;
+      align-items: center;
+      border: 1px dashed #d9d9d9;
+      border-radius: 4px;
+      padding: 3px;
+      .productPic{
+        cursor: pointer;
+        max-width: 100%;
+        max-height: 100%;
+        display: block;
+        margin: 0 auto;
+      }
     }
     .btn-cont {
       text-align: center;

+ 8 - 5
src/views/productManagement/productInfo/edit.vue

@@ -135,8 +135,8 @@
                 id="productInfoEdit-productMsg"
                 v-model="form.productMsg"
                 ref="productMsg"
-                :fileSize="0.25"
-                @change="changeHomeImage"
+                @change="changeImage"
+                :maxNums="5"
                 listType="picture-card" ></Upload>
             </a-form-model-item>
           </a-col>
@@ -279,8 +279,8 @@ export default {
         if (res.status == 200) {
           const data = res.data
           this.form = Object.assign(this.form, data)
-          console.log(this.form)
           this.form.productType = [ this.form.productTypeSn1, this.form.productTypeSn2, this.form.productTypeSn3 ]
+          this.$refs.productMsg.setFileList(res.data.productMsg)
           this.$refs.editor.setHtml(res.data.description)
           this.$refs.otherDesc.setHtml(res.data.otherDesc)
         } else {
@@ -320,8 +320,8 @@ export default {
       this.$router.push({ path: '/productManagement/productInfo/list' })
     },
     // 产品图片上传
-    changeHomeImage (file) {
-      this.form.homeImage = file
+    changeImage (file) {
+      this.form.productMsg = file
     },
     // 产品说明 文本编辑器
     editorDescriptionChange (html, text) {
@@ -365,6 +365,9 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
+      vm.$refs.productMsg.setFileList('')
+      vm.$refs.editor.setHtml('')
+      vm.$refs.otherDesc.setHtml('')
       vm.$refs.ruleForm.resetFields()
       vm.getProductBrand()
       vm.getProductType()

+ 1 - 1
src/views/productManagement/productPricing/list.vue

@@ -72,7 +72,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 2110 }"
+      :scroll="{ x: 2110, y: tableHeight }"
       bordered>
       <!-- 产品分类 -->
       <template slot="productType" slot-scope="text, record">

+ 11 - 8
src/views/promotionRulesManagement/promotionRules/list.vue

@@ -34,7 +34,7 @@
     </div>
     <!-- 操作按钮 -->
     <div class="table-operator">
-      <a-button id="promotionRulesList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
+      <a-button id="promotionRulesList-add" type="primary" class="button-error" @click="openModal=true">新增</a-button>
     </div>
     <!-- 总计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
@@ -82,6 +82,8 @@
           id="promotionRulesList-detail-btn">详情</a-button>
       </template>
     </s-table>
+    <!-- 新增/编辑 -->
+    <basic-info-modal :openModal="openModal" @ok="handleOk" @close="openModal=false" />
   </a-card>
 </template>
 
@@ -91,8 +93,9 @@ import moment from 'moment'
 // import { dealerProductTypeList } from '@/api/dealerProductType'
 // import { dealerProductList, dealerProductUpdate, dealerProductExport } from '@/api/dealerProduct'
 import { STable, VSelect } from '@/components'
+import basicInfoModal from './basicInfoModal.vue'
 export default {
-  components: { STable, VSelect },
+  components: { STable, VSelect, basicInfoModal },
   data () {
     return {
       createDate: [], //  创建时间
@@ -159,13 +162,13 @@ export default {
       this.createDate = []
       this.$refs.table.refresh(true)
     },
-    //  新增/编辑
+    //  编辑
     handleEdit (row) {
-      if (row) { //  编辑
-        this.$router.push({ path: `/promotionRulesManagement/promotionRules/edit/${row.id}` })
-      } else { //  新增
-        this.$router.push({ path: '/promotionRulesManagement/promotionRules/add' })
-      }
+      this.$router.push({ path: `/promotionRulesManagement/promotionRules/edit/${row.id}` })
+    },
+    //  基本信息  保存
+    handleOk (data) {
+      this.$router.push({ path: `/promotionRulesManagement/promotionRules/add/${data.id}/${data.storeCallOutSn}` })
     },
     //  详情
     handleDetail (row) {

+ 38 - 46
src/views/salesManagement/outboundOrder/list.vue

@@ -18,7 +18,7 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="客户名称">
-              <custList id="outboundOrderList-demanderName" v-model="queryParam.demanderName"></custList>
+              <a-input id="outboundOrderList-demanderName" v-model.trim="queryParam.demanderName" allowClear placeholder="请输入客户名称"/>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -34,13 +34,13 @@
           </a-col>
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
-              <a-form-item label="单据状态">
+              <a-form-item label="出库状态">
                 <v-select
                   v-model="queryParam.state"
                   ref="state"
                   id="outboundOrderList-state"
                   code="OUT_STATE"
-                  placeholder="请选择单据状态"
+                  placeholder="请选择出库状态"
                   allowClear></v-select>
               </a-form-item>
             </a-col>
@@ -84,6 +84,10 @@
       :data="loadData"
       :scroll="{ x: 1720, y: tableHeight }"
       bordered>
+      <!-- 单号 -->
+      <template slot="outBizNo" slot-scope="text, record">
+        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.outBizNo }}</span>
+      </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
         <a-button
@@ -93,12 +97,6 @@
           class="button-primary"
           @click="handleOutbound(record)"
           id="outboundOrderList-out-btn">出库</a-button>
-        <a-button
-          size="small"
-          type="link"
-          class="button-success"
-          @click="handleDetail(record)"
-          id="outboundOrderList-detail-btn">详情</a-button>
       </template>
     </s-table>
   </a-card>
@@ -107,16 +105,15 @@
 <script>
 import moment from 'moment'
 import { STable, VSelect } from '@/components'
-import custList from '@/views/common/custList.js'
 import { stockOutList, stockOutOut } from '@/api/stockOut'
 export default {
-  components: { STable, VSelect, custList },
+  components: { STable, VSelect },
   data () {
     return {
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0, // 表格高度
       queryParam: { //  查询条件
-        demanderName: undefined, //  客户名称
+        demanderName: '', //  客户名称
         outBizType: undefined, //  出库类型
         state: undefined //  状态
       },
@@ -126,16 +123,15 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center' },
-        { title: '关联单号', dataIndex: 'outBizNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '下推单号', scopedSlots: { customRender: 'outBizNo' }, width: 220, align: 'center' },
+        { title: '单号', dataIndex: 'stockOutNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'demanderName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '总款数', dataIndex: 'productTotalCategory', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总售价', dataIndex: 'productTotalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'demanderName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '数量', dataIndex: 'productTotalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '售价', dataIndex: 'productTotalPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '出库时间', dataIndex: 'outTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库状态', dataIndex: 'stateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 140, align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       selectedRowKeys: [], // Check here to configure the default column
       loading: false,
@@ -195,7 +191,7 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.queryParam.demanderName = undefined
+      this.queryParam.demanderName = ''
       this.queryParam.outBizType = undefined
       this.queryParam.state = undefined
       this.time = []
@@ -204,28 +200,28 @@ export default {
     //  详情
     handleDetail (row) {
       //  根据出库类型跳转对应页面
-      if (row.outBizType == 'PURCHASE_RETURN') { // 采购退货
-        this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
-      } else if (row.outBizType == 'SPARE_PARTS_RETURN') { // 散件退货
-        this.$message.warning('该出库类型对应页面未开发')
-        // this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
-      } else if (row.outBizType == 'SALES') { // 出库
-        this.$router.push({ path: `/salesManagement/salesQuery/detail/${row.outBizSn}` })
-      } else if (row.outBizType == 'DISPATCH_DEDUCT') { // 急件冲减
-        this.$router.push({ path: `/salesManagement/urgentItemsOffset/detail/${row.outBizSn}` })
-      } else if (row.outBizType == 'SHOP_CALL_OUT') { // 店内调出
-        this.$router.push({ path: `/allocationManagement/storeTransferOut/detail/${row.outBizSn}` })
-      } else if (row.outBizType == 'CHECK_ORDER_OUT') { // 库存盘点盘亏
-        this.$message.warning('该出库类型对应页面未开发')
-        // this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
-      } else if (row.outBizType == 'LINKAGE_CALL_OUT') { // 连锁调出
-        this.$message.warning('该出库类型对应页面未开发')
-        // this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
-      } else if (row.outBizType == 'WAREHOUSE_CALL_OUT') { // 仓库调出
-        this.$router.push({ path: `/allocationManagement/warehouseAllocation/detail/${row.outBizSn}` })
-      } else {
-        this.$message.warning('出库类型未知')
-      }
+      // if (row.outBizType == 'PURCHASE_RETURN') { // 采购退货
+      //   this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
+      // } else if (row.outBizType == 'SPARE_PARTS_RETURN') { // 散件退货
+      //   this.$message.warning('该出库类型对应页面未开发')
+      //   // this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
+      // } else if (row.outBizType == 'SALES') { // 出库
+      //   this.$router.push({ path: `/salesManagement/salesQuery/detail/${row.outBizSn}` })
+      // } else if (row.outBizType == 'DISPATCH_DEDUCT') { // 急件冲减
+      //   this.$router.push({ path: `/salesManagement/urgentItemsOffset/detail/${row.outBizSn}` })
+      // } else if (row.outBizType == 'SHOP_CALL_OUT') { // 店内调出
+      //   this.$router.push({ path: `/allocationManagement/storeTransferOut/detail/${row.outBizSn}` })
+      // } else if (row.outBizType == 'CHECK_ORDER_OUT') { // 库存盘点盘亏
+      //   this.$message.warning('该出库类型对应页面未开发')
+      //   // this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
+      // } else if (row.outBizType == 'LINKAGE_CALL_OUT') { // 连锁调出
+      //   this.$message.warning('该出库类型对应页面未开发')
+      //   // this.$router.push({ path: `/purchasingManagement/purchaseReturn/detail/${row.outBizSn}` })
+      // } else if (row.outBizType == 'WAREHOUSE_CALL_OUT') { // 仓库调出
+      //   this.$router.push({ path: `/allocationManagement/warehouseAllocation/detail/${row.outBizSn}` })
+      // } else {
+      //   this.$message.warning('出库类型未知')
+      // }
     },
     // 单个出库
     handleOutbound (row) {
@@ -261,10 +257,6 @@ export default {
       console.log('selectedRowKeys changed: ', selectedRowKeys)
       this.selectedRowKeys = selectedRowKeys
     }
-  },
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
-    })
   }
 }
 </script>

+ 2 - 2
src/views/setting/noticeManagement/detailModal.vue

@@ -145,8 +145,8 @@ export default {
       width: 90px;
     }
     .pic-box{
-      width: 200px;
-      height: 200px;
+      width: 100px;
+      height: 100px;
       margin-right: 10px;
       display: inline-flex;
       align-items: center;