Browse Source

Merge commit '5b27b22ca5b6357357645678cc44affd2bd81c28' into HEAD

gitadmin 7 months ago
parent
commit
130e17da23

BIN
public/templ/销售单产品明细导入模板.xlsx


+ 2 - 2
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -149,10 +149,10 @@
             type="link"
             class="button-error"
             :id="'purchaseOrderList-del-'+record.id"
-            v-if="(record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'AUDIT_REJECT') &&$hasPermissions('B_purchaseDel')"
+            v-if="(record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'AUDIT_REJECT'||record.billStatus == 'CANCEL') &&$hasPermissions('B_purchaseDel')"
             @click="handleDel(record)"
           >删除</a-button>
-          <span v-if="!((record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'AUDIT_REJECT') && $hasPermissions('B_purchaseEdit')) && !((record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'AUDIT_REJECT') &&$hasPermissions('B_purchaseDel'))">--</span>
+          <span v-if="!((record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'AUDIT_REJECT'||record.billStatus == 'CANCEL') && $hasPermissions('B_purchaseEdit')) && !((record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'AUDIT_REJECT') &&$hasPermissions('B_purchaseDel'))">--</span>
         </template>
       </s-table>
     </a-spin>

+ 3 - 8
src/views/purchasingManagement/purchaseOrderNew/chooseProductModal.vue

@@ -111,12 +111,7 @@
           </template>
         </s-table>
         <div v-else>
-          <a-empty
-            :image="simpleImage"
-            :image-style="{
-              height: '60px',
-            }"
-          >
+          <a-empty :image="simpleImage" :image-style="{height: '60px'}">
             <span style="color:red" slot="description">请输入查询条件</span>
           </a-empty>
         </div>
@@ -236,7 +231,7 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '50px', align: 'center' },
-        { title: '产品名称', dataIndex: 'name', width: '180px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'name', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'origCode', width: '150px', align: 'center', customRender: function (text) { return text && text != ' ' ? text : '--' } },
         { title: '在途数', dataIndex: 'transitQty', width: '60px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '可用库存', dataIndex: 'currentStockQty', width: '60px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -246,7 +241,7 @@ export default {
         { title: '终端会员价', dataIndex: 'terminalPrice', width: '80px', align: 'right', fixed: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
         { title: '车主零售价', dataIndex: 'carOwnersPrice', width: '80px', align: 'right', fixed: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
         { title: '采购数量', dataIndex: 'qty', scopedSlots: { customRender: 'storageQuantity' }, width: '80px', align: 'center', fixed: 'right' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '60px', align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '80px', align: 'center', fixed: 'right' }
       ]
       // 产品来源,如果时上级
       if (this.isDealerUp) {

+ 2 - 2
src/views/purchasingManagement/purchaseOrderNew/list.vue

@@ -145,9 +145,9 @@
               size="small"
               type="link"
               class="button-error"
-              v-if="(record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'AUDIT_REJECT') &&$hasPermissions('B_purchaseDel')"
+              v-if="(record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'AUDIT_REJECT'||record.billStatus == 'CANCEL') &&$hasPermissions('B_purchaseDel')"
               @click="handleDel(record)">删除</a-button>
-            <span v-if="!((record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'AUDIT_REJECT') && $hasPermissions('B_purchaseEdit')) && !((record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'AUDIT_REJECT') &&$hasPermissions('B_purchaseDel'))">--</span>
+            <span v-if="!((record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'AUDIT_REJECT'||record.billStatus == 'CANCEL') && $hasPermissions('B_purchaseEdit')) && !((record.billStatus == 'WAIT_SUBMIT'||record.billStatus == 'AUDIT_REJECT') &&$hasPermissions('B_purchaseDel'))">--</span>
           </template>
         </s-table>
       </a-spin>

+ 2 - 2
src/views/salesManagement/salesQuery/chooseImportModal.vue

@@ -116,8 +116,8 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '售价', dataIndex: 'importPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '数量', dataIndex: 'importQty', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '售价', dataIndex: 'importPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '数量', dataIndex: 'importQty', width: '20%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
         { title: '错误说明', scopedSlots: { customRender: 'errorMsg' }, width: '10%', align: 'center' }
       ],
       unLoadData: [],

+ 1 - 1
src/views/salesManagement/salesQuery/importGuideModal.vue

@@ -15,7 +15,7 @@
             <span>1</span>准备导入
           </div>
           <ul>
-            <li>1) 导入的Excel文件中必须包含名为“产品编码”、“仓库”、“仓位”、“售价”、“数量”的列,且名称必须相同,其它列可自定义,不影响数据导入</li>
+            <li>1) 导入的Excel文件中必须包含名为“产品编码”、“仓库”、“仓位”、“数量”的列,且名称必须相同,其它列可自定义,不影响数据导入</li>
             <li>2) 如果导入的产品已经存在,则不会导入该行</li>
             <li>
               <a :href="filePath" style="margin: 5px 0 0;display: block;" id="sales-import-tpl">

+ 2 - 1
src/views/salesManagement/salesQuery/list.vue

@@ -228,9 +228,10 @@
             type="link"
             :id="'salesManagementList-del-'+record.salesBillNo"
             class="button-error"
-            v-if="((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING' ) && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel')"
+            v-if="((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' ) && record.billStatus != 'FINISH')||(record.sourceType == 'TEMPORARY_DISPATCHING'&&record.billStatus != 'FINISH'&&record.billStatus != 'WAIT_OUT_WAREHOUSE') && $hasPermissions('B_salesDel')"
             @click="handleDel(record)"
           >
+            <!--  -->
             删除
           </a-button>
           <a-button

+ 2 - 2
src/views/salesManagement/salesQueryNew/chooseImportModal.vue

@@ -116,8 +116,8 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '售价', dataIndex: 'importPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '数量', dataIndex: 'importQty', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '售价', dataIndex: 'importPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '数量', dataIndex: 'importQty', width: '20%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
         { title: '错误说明', scopedSlots: { customRender: 'errorMsg' }, width: '10%', align: 'center' }
       ],
       unLoadData: [],

+ 1 - 1
src/views/salesManagement/salesQueryNew/importGuideModal.vue

@@ -15,7 +15,7 @@
             <span>1</span>准备导入
           </div>
           <ul>
-            <li>1) 导入的Excel文件中必须包含名为“产品编码”、“仓库”、“仓位”、“售价”、“数量”的列,且名称必须相同,其它列可自定义,不影响数据导入</li>
+            <li>1) 导入的Excel文件中必须包含名为“产品编码”、“仓库”、“仓位”、“数量”的列,且名称必须相同,其它列可自定义,不影响数据导入</li>
             <li>2) 如果导入的产品已经存在,则不会导入该行</li>
             <li>
               <a :href="filePath" style="margin: 5px 0 0;display: block;">

+ 3 - 1
src/views/salesManagement/salesQueryNew/list.vue

@@ -199,6 +199,8 @@
             <stateIcon :title="record.financialStatusDictValue" :state="record.financialStatus == 'FINISH'?'1':'2'"></stateIcon>
           </template>
           <!-- 操作按钮 -->
+          <!-- sourceType SALES自建   CHILD_PURCHASE下级创建  DEALER_PURCHASE省仓订单  XPRH_PURCHASE货架促销  TEMPORARY_DISPATCHING数字货架 -->
+          <!-- billStatus  WAIT_SUBMIT待提交   WAIT_AUDIT待审核    AUDIT_REJECT审核不通过  WAIT_OUT_WAREHOUSE待出库   FINISH已完结  SUPERIOR_CHANGE上级改单  CANCEL已取消 -->
           <template slot="action" slot-scope="text, record">
             <a-button
               :id="'salesManagementList-audit-'+record.id"
@@ -231,7 +233,7 @@
               size="small"
               type="link"
               class="button-error"
-              v-if="((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel')"
+              v-if="((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' ) && record.billStatus != 'FINISH')||(record.sourceType == 'TEMPORARY_DISPATCHING'&&record.billStatus != 'FINISH'&&record.billStatus != 'WAIT_OUT_WAREHOUSE')&& $hasPermissions('B_salesDel')"
               @click="handleDel(record)"
             >
               删除