chenrui 11 ay önce
ebeveyn
işleme
c050dd820e

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

@@ -109,7 +109,7 @@
         @click="handleBack"
         style="padding: 0 60px;">保存</a-button>
     </div>
-    <spare-parts-product-modal :openModal="openModal" :itemSn="itemSn" :nowData="productTotal" @ok="$refs.table.refresh(true)" @close="closeModal" />
+    <spare-parts-product-modal :openModal="openModal" :itemSn="itemSn" :nowData="basicInfoData" @ok="$refs.table.refresh(true)" @close="closeModal" />
     <!-- 导入产品 -->
     <importGuideModal :openModal="openGuideModal" :params="{sparePartsSn: $route.params.sn}" @close="openGuideModal=false" @ok="hanldeOk" />
   </div>

+ 108 - 108
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -25,46 +25,46 @@
                 <a-input id="bulkWarehousingOrderList-supplierName" v-model.trim="queryParam.supplierName" allowClear placeholder="请输入商户名称"/>
               </a-form-item>
             </a-col>
-          <template v-if="advanced">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="金蝶单号">
-                <a-input id="bulkWarehousingOrderList-kingdeeNo" v-model.trim="queryParam.kingdeeNo" allowClear placeholder="请输入金蝶单号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="入库类型">
-                <v-select
-                  v-model="queryParam.sparePartsType"
-                  ref="sparePartsType"
-                  id="bulkWarehousingOrderList-sparePartsType"
-                  code="SPARE_PARTS_TYPE"
-                  placeholder="请选择入库类型"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24" v-show="isShowWarehouse">
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="金蝶单号">
+                  <a-input id="bulkWarehousingOrderList-kingdeeNo" v-model.trim="queryParam.kingdeeNo" allowClear placeholder="请输入金蝶单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="入库类型">
+                  <v-select
+                    v-model="queryParam.sparePartsType"
+                    ref="sparePartsType"
+                    id="bulkWarehousingOrderList-sparePartsType"
+                    code="SPARE_PARTS_TYPE"
+                    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="salesReturn-warehouseSn"
+                    id="bulkWarehousingOrderList-warehouseSn"
                     placeholder="请选择入库仓库"
                   />
                 </a-form-item>
               </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="状态">
-                <v-select
-                  v-model="queryParam.state"
-                  ref="state"
-                  id="bulkWarehousingOrderList-state"
-                  code="SPARE_PARTS_STATE"
-                  placeholder="请选择状态"
-                  allowClear
-                ></v-select>
-              </a-form-item>
-            </a-col>
-          </template>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="状态">
+                  <v-select
+                    v-model="queryParam.state"
+                    ref="state"
+                    id="bulkWarehousingOrderList-state"
+                    code="SPARE_PARTS_STATE"
+                    placeholder="请选择状态"
+                    allowClear
+                  ></v-select>
+                </a-form-item>
+              </a-col>
+            </template>
             <a-col :md="24" :sm="24" style="text-align: center;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="bulkWarehousingOrderList-refresh">查询</a-button>
               <a-button style="margin-left: 10px" @click="resetSearchForm()" :disabled="disabled" id="bulkWarehousingOrderList-reset">重置</a-button>
@@ -76,6 +76,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
+                id="bulkWarehousingOrderList-export"
               >导出明细</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
                 {{ advanced ? '收起' : '展开' }}
@@ -86,81 +87,80 @@
         </a-form>
       </div>
     </a-card>
-  
-  <a-card size="small" :bordered="false" class="bulkWarehousingOrderList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button v-if="$hasPermissions('B_sparePartsNew')" id="bulkWarehousingOrderList-add" type="primary" @click="handleAdd">新增</a-button>
-        <a-button
-          v-if="$hasPermissions('B_sparePartsBatchAudit')"
-          id="bulkWarehousingOrderList-batchAudit"
-          type="primary"
-          class="button-warning"
-          :loading="loading"
-          @click="handleBatchAudit"
-          style="margin: 0 3px;">批量审核</a-button>
-        <span style="margin-left: 10px">
-          <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
-        </span>
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+70+'px' }"
-        size="small"
-        :rowKey="(record) => record.sparePartsSn"
-        rowKeyName="sparePartsSn"
-        :row-selection="$hasPermissions('B_sparePartsBatchAudit')?{ columnWidth: '4%', getCheckboxProps: record => ({ props: { disabled: record.state != 'WAIT_AUDIT' } }) }:null"
-        @rowSelection="rowSelectionFun"
-        :columns="columns"
-        :pageSize="30"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 入库单号 -->
-        <template slot="sparePartsNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('B_sparePartsDetail')" class="link-bule" @click="handleDetail(record)">{{ record.sparePartsNo }}</span>
-          <span v-else>{{ record.sparePartsNo }}</span>
-        </template>
-        <!-- 操作 -->
-        <template slot="action" slot-scope="text, record">
+    <a-card size="small" :bordered="false" class="bulkWarehousingOrderList-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button v-if="$hasPermissions('B_sparePartsNew')" id="bulkWarehousingOrderList-add" type="primary" @click="handleAdd">新增</a-button>
           <a-button
-            size="small"
-            type="link"
-            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_sparePartsAudit')"
+            v-if="$hasPermissions('B_sparePartsBatchAudit')"
+            id="bulkWarehousingOrderList-batchAudit"
+            type="primary"
             class="button-warning"
-            @click="handleAudit(record)"
-            id="allocateBillList-examine-btn">审核</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_sparePartsEdit')"
-            @click="handleEdit(record)"
-            class="button-info"
-            id="bulkWarehousingOrderList-edit-btn">编辑</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_sparePartsDel')"
-            @click="handleDel(record)"
-            class="button-error"
-            id="bulkWarehousingOrderList-del-btn">删除</a-button>
-          <span v-if="!(record.state == 'WAIT_AUDIT'&&($hasPermissions('B_sparePartsEdit') || $hasPermissions('B_sparePartsDel') || $hasPermissions('B_sparePartsAudit')))">--</span>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 选择基本信息弹框 -->
-    <basic-info-modal v-drag :openModal="openModal" @ok="handleOk" @close="openModal=false" />
-    <sparePartsDetailModal v-drag :openModal="openDetailModal" :itemSn="itemSn" @close="closeDetailModal" />
-    <!-- 导出提示框 -->
-    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
-    <!-- 审核不通过弹框 -->
-    <auditNoPassModal v-drag ref="auditNoPassModal" :openModal="openAuditNoModal" @close="openAuditNoModal=false" />
-    <batchAuditNoModal v-drag ref="batchAuditNoModal" :openModal="openBatchAuditNoModal" @close="openBatchAuditNoModal=false" @ok="hanldeAuditOk" />
-  </a-card>
+            :loading="loading"
+            @click="handleBatchAudit"
+            style="margin: 0 3px;">批量审核</a-button>
+          <span style="margin-left: 10px">
+            <template v-if="rowSelectionInfo && rowSelectionInfo.selectedRowKeys.length>0">{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}</template>
+          </span>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.sparePartsSn"
+          rowKeyName="sparePartsSn"
+          :row-selection="$hasPermissions('B_sparePartsBatchAudit')?{ columnWidth: '4%', getCheckboxProps: record => ({ props: { disabled: record.state != 'WAIT_AUDIT' } }) }:null"
+          @rowSelection="rowSelectionFun"
+          :columns="columns"
+          :pageSize="30"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 入库单号 -->
+          <template slot="sparePartsNo" slot-scope="text, record">
+            <span v-if="$hasPermissions('B_sparePartsDetail')" class="link-bule" @click="handleDetail(record)">{{ record.sparePartsNo }}</span>
+            <span v-else>{{ record.sparePartsNo }}</span>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_sparePartsAudit')"
+              class="button-warning"
+              @click="handleAudit(record)"
+              id="allocateBillList-examine-btn">审核</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_sparePartsEdit')"
+              @click="handleEdit(record)"
+              class="button-info"
+              id="bulkWarehousingOrderList-edit-btn">编辑</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_sparePartsDel')"
+              @click="handleDel(record)"
+              class="button-error"
+              id="bulkWarehousingOrderList-del-btn">删除</a-button>
+            <span v-if="!(record.state == 'WAIT_AUDIT'&&($hasPermissions('B_sparePartsEdit') || $hasPermissions('B_sparePartsDel') || $hasPermissions('B_sparePartsAudit')))">--</span>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 选择基本信息弹框 -->
+      <basic-info-modal v-drag :openModal="openModal" @ok="handleOk" @close="openModal=false" />
+      <sparePartsDetailModal v-drag :openModal="openDetailModal" :itemSn="itemSn" @close="closeDetailModal" />
+      <!-- 导出提示框 -->
+      <reportModal :visible="showExport" @close="showExport=false"></reportModal>
+      <!-- 审核不通过弹框 -->
+      <auditNoPassModal v-drag ref="auditNoPassModal" :openModal="openAuditNoModal" @close="openAuditNoModal=false" />
+      <batchAuditNoModal v-drag ref="batchAuditNoModal" :openModal="openBatchAuditNoModal" @close="openBatchAuditNoModal=false" @ok="hanldeAuditOk" />
+    </a-card>
   </div>
 </template>
 
@@ -241,12 +241,12 @@ export default {
 	      { title: '备注', dataIndex: 'remark', width: '9%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
 	      { title: '操作', scopedSlots: { customRender: 'action' }, width: '9%', align: 'center' }
 	    ]
-      
+
 	    if (this.$hasPermissions('M_bulkWarehousingOrderList_costPrice')) { //  成本价权限
 	      arr.splice(4, 0, { title: '入库成本', dataIndex: 'productTotalCost', width: '6%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
 	    }
       if (this.isShowWarehouse) {
-        arr.splice(this.$hasPermissions('M_bulkWarehousingOrderList_costPrice')?6:5, 0, { title: '入库仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } })
+        arr.splice(this.$hasPermissions('M_bulkWarehousingOrderList_costPrice') ? 6 : 5, 0, { title: '入库仓库', dataIndex: 'warehouseName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } })
       }
 	    return arr
 	  }
@@ -262,7 +262,7 @@ export default {
       this.$store.state.app.curActionPermission = 'B_sparePartsExport'
       _this.exportLoading = true
       _this.spinning = true
-      hdExportExcel(sparePartsDetailExport, _this.queryParam , '散件入库明细', function () {
+      hdExportExcel(sparePartsDetailExport, _this.queryParam, '散件入库明细', function () {
         _this.exportLoading = false
         _this.spinning = false
         _this.showExport = true

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

@@ -18,7 +18,7 @@
           <a-descriptions :column="3">
             <a-descriptions-item label="供应商">{{ (basicInfoData&&basicInfoData.supplierName) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="入库仓库">{{ (basicInfoData&&basicInfoData.warehouseName) || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="采购单号">{{ (basicInfoData&&basicInfoData.lockBizNo) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="采购单号">{{ (basicInfoData&&basicInfoData.sparePartsNo) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="客户名称">{{ (basicInfoData&&basicInfoData.lockBizDealerName) || '--' }}</a-descriptions-item>
           </a-descriptions>
         </a-collapse-panel>

+ 11 - 4
src/views/purchasingManagement/purchaseReceipt/list.vue

@@ -23,7 +23,14 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="供应商名称">
-                <supplier id="purchaseReceiptList-supplierSn" v-model="queryParam.supplierSn" isPermission placeholder="请输入供应商名称"></supplier>
+                <supplier
+                  id="purchaseReceiptList-supplierSn"
+                  enableFlag="1"
+                  pageSn="544577718475575296"
+                  s
+                  v-model="queryParam.supplierSn"
+                  isPermission
+                  placeholder="请输入供应商名称"></supplier>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
@@ -259,9 +266,9 @@ export default {
         // { title: '采购金额', dataIndex: 'productTotalCost', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
         { title: '入库仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '关联单号', dataIndex: 'lockBizNo', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'lockBizDealerName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '业务状态', dataIndex: 'stateDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '供应商状态', dataIndex: 'thirdpartyBizStateDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'lockBizDealerName', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '业务状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '供应商状态', dataIndex: 'thirdpartyBizStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '备注', dataIndex: 'bizRemark', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]

+ 1 - 1
src/views/purchasingManagement/purchaseReceipt/seeVoucherModal.vue

@@ -11,7 +11,7 @@
     <div class="seeVoucher-con">
       <div v-if="itemData&&itemData.length>0" class="seeVoucher-main">
         <div v-for="item in itemData" :key="item.id" style="margin-bottom: 10px;">
-          <a class="link-bule" v-if="item.extName!=('jpg'||'jpeg'||'png')" :href="item.filePath">
+          <a class="link-bule" v-if="item.extName!='jpg'&&item.extName!='jpeg'&&item.extName!='png'" :href="item.filePath">
             <a-icon type="download" style="padding-right: 5px;" />{{ item.fileName }}
           </a>
           <img v-else :src="item.filePath" alt="图片走丢了" width="100%"/>