lilei 2 years ago
parent
commit
65997524ff

+ 1 - 1
public/version.json

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

+ 5 - 5
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -130,12 +130,12 @@
       <div class="footer-bar" v-if="detail&&detail.totalCategory">
       <div class="footer-bar" v-if="detail&&detail.totalCategory">
         <!-- 总计 -->
         <!-- 总计 -->
         <div>
         <div>
-          <span style="color:#666;">
-            共计 {{ detail && (detail.totalCategory || detail.totalCategory==0) ? detail.totalCategory : '--' }} 款
-            {{ detail && (detail.totalQty || detail.totalQty==0) ? detail.totalQty : '--' }} 件产品 
-          </span>
+          <div style="display: inline-block;">
+            产品总款数:<span style="color:#666">{{ detail && (detail.totalCategory || detail.totalCategory==0) ? detail.totalCategory : '--' }}</span>,
+            采购总数量:<span style="color:#666">{{ detail && (detail.totalQty || detail.totalQty==0) ? detail.totalQty : '--' }}</span>
+          </div>
           <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
           <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-            合计: <strong>{{ detail && (detail.discountedAmount || detail.discountedAmount==0) ?toThousands(detail.discountedAmount, 2) : '--' }}</strong>
+            采购金额合计: <strong>{{ detail && (detail.discountedAmount || detail.discountedAmount==0) ?toThousands(detail.discountedAmount, 2) : '--' }}</strong>
           </div>
           </div>
         </div>
         </div>
         <div>
         <div>

+ 49 - 38
src/views/salesManagement/salesQueryNew/edit.vue

@@ -94,7 +94,9 @@
               </a-row>
               </a-row>
             </a-form-model>
             </a-form-model>
           </div>
           </div>
-          
+          <div class="discount-box">
+            
+          </div>
           <!-- 已选配件列表 -->
           <!-- 已选配件列表 -->
           <s-table
           <s-table
             class="sTable"
             class="sTable"
@@ -143,7 +145,15 @@
             <!-- 售价 -->
             <!-- 售价 -->
             <template slot="price" slot-scope="text, record">
             <template slot="price" slot-scope="text, record">
               <div style="display:flex;align-items: center;" :class="record.cost > record.price?'redBg-row':''">
               <div style="display:flex;align-items: center;" :class="record.cost > record.price?'redBg-row':''">
-                <a-input-number
+              <div v-if="record.cost > record.price">
+                <a-tooltip placement="top">
+                  <template slot="title">
+                    售价低于成本价
+                  </template>
+                  <a-icon type="warning" />
+                </a-tooltip>
+              </div>
+              <a-input-number
                 size="small"
                 size="small"
                 v-model="record.price"
                 v-model="record.price"
                 :precision="2"
                 :precision="2"
@@ -151,16 +161,8 @@
                 :max="999999"
                 :max="999999"
                 placeholder="请输入"
                 placeholder="请输入"
                 @blur="e => priceBlur(e.target.value, record)"
                 @blur="e => priceBlur(e.target.value, record)"
-                style="flex-grow: 1;margin-right: 3px;"
+                style="flex-grow: 1;margin-left: 3px;text-align: right;"
                 />
                 />
-              <div v-if="record.cost > record.price">
-                <a-tooltip placement="top">
-                  <template slot="title">
-                    售价低于成本价
-                  </template>
-                  <a-icon type="question-circle" />
-                </a-tooltip>
-              </div>
               </div>
               </div>
             </template>
             </template>
             <!-- 销售数量 -->
             <!-- 销售数量 -->
@@ -210,6 +212,18 @@
       <div class="footer-bar" v-if="detailData&&detailData.totalCategory">
       <div class="footer-bar" v-if="detailData&&detailData.totalCategory">
         <!-- 总计 -->
         <!-- 总计 -->
         <div v-if="detailData" class="total-bar">
         <div v-if="detailData" class="total-bar">
+          <div>
+            总款数:<span>{{ detailData&&(detailData.totalCategory || detailData.totalCategory==0) ? detailData.totalCategory : '--' }}</span>,
+            总数量:<span>{{ detailData&&(detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }}</span>,
+            赠品总数量:<span>{{ detailData&&(detailData.giftQty || detailData.giftQty==0) ? detailData.giftQty : '--' }}</span>,
+            <template v-if="isCosts">
+              总成本价:<span class="red">{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? toThousands(detailData.totalCost) : '--' }}</span>,
+              毛利:<span class="red">{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? toThousands(detailData.grossProfit) : '--' }}</span>,
+            </template>
+            <div style="display: inline-block;">
+              总售价:<span class="red">{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</span>
+            </div>
+          </div>
           <div>
           <div>
             <div style="display: inline-block;">
             <div style="display: inline-block;">
               折扣金额:
               折扣金额:
@@ -223,25 +237,20 @@
                 :max="999999"/>
                 :max="999999"/>
               折扣:<span class="red">{{ detailData&&(detailData.discountRate || detailData.discountRate==0) ? detailData.discountRate+'%' : '--' }}</span>,
               折扣:<span class="red">{{ detailData&&(detailData.discountRate || detailData.discountRate==0) ? detailData.discountRate+'%' : '--' }}</span>,
             </div>
             </div>
-            <div style="display: inline-block;">
-              <span>共计 {{ detailData&&(detailData.totalCategory || detailData.totalCategory==0) ? detailData.totalCategory : '--' }} 款</span>
-              <span> {{ detailData&&(detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }} 件产品</span>
-              <span>(赠品 {{ detailData&&(detailData.giftQty || detailData.giftQty==0) ? detailData.giftQty : '--' }} 件)</span>,
-              <template v-if="isCosts">
-                总成本价:<span class="red">{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? toThousands(detailData.totalCost) : '--' }}</span>,
-                毛利:<span class="red">{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? toThousands(detailData.grossProfit) : '--' }}</span>,
-              </template>
-              总售价:<span class="red">{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</span>,
-            </div>
-            <div class="totalPrice" style="display: inline-block;">
+            <div class="totalPrice" style="display: inline-block;padding:0;">
               折后合计:<strong>{{ detailData&&(detailData.discountedAmount || detailData.discountedAmount==0) ? toThousands(detailData.discountedAmount) : '--' }}</strong>
               折后合计:<strong>{{ detailData&&(detailData.discountedAmount || detailData.discountedAmount==0) ? toThousands(detailData.discountedAmount) : '--' }}</strong>
             </div>
             </div>
           </div>
           </div>
-          <div style="padding:5px 0 0;">
-            <a-checkbox :value="0" :checked="tbForm.indexOf('AUDIT')>=0" @change="(e)=>{tbFormChange(e,0)}" id="salesQuery-tbsh">同步审核</a-checkbox>
-            <a-checkbox :value="1" :checked="tbForm.indexOf('STOCK_OUT')>=0" @change="(e)=>{tbFormChange(e,1)}" id="salesQuery-tbck">同步出库</a-checkbox>
-            <a-checkbox :value="2" :checked="tbForm.indexOf('SETTLE')>=0" @change="(e)=>{tbFormChange(e,2)}" id="salesQuery-tbsk">同步收款</a-checkbox>
-          </div>
+      </div>
+      <div>
+        <a-dropdown>
+          <a-menu slot="overlay">
+            <a-menu-item key="1"> <a-checkbox :value="0" :checked="tbForm.indexOf('AUDIT')>=0" @change="(e)=>{tbFormChange(e,0)}" id="salesQuery-tbsh">同步审核</a-checkbox> </a-menu-item>
+            <a-menu-item key="2"> <a-checkbox :value="1" :checked="tbForm.indexOf('STOCK_OUT')>=0" @change="(e)=>{tbFormChange(e,1)}" id="salesQuery-tbck">同步出库</a-checkbox> </a-menu-item>
+            <a-menu-item key="3"> <a-checkbox :value="2" :checked="tbForm.indexOf('SETTLE')>=0" @change="(e)=>{tbFormChange(e,2)}" id="salesQuery-tbsk">同步收款</a-checkbox></a-menu-item>
+          </a-menu>
+          <a-button style="margin-left: 8px" size="large"> 选择同步操作 <a-icon type="down" /> </a-button>
+        </a-dropdown>
       </div>
       </div>
         <div>
         <div>
           <a-button
           <a-button
@@ -618,10 +627,12 @@ export default {
         onOk () {
         onOk () {
           _this.spinning = true
           _this.spinning = true
           let params = { id: _this.orderId, oosFlag: oosFlag==1 ? 1 : undefined }
           let params = { id: _this.orderId, oosFlag: oosFlag==1 ? 1 : undefined }
-          console.log(params,oosFlag==1)
           salesDel(params).then(res => {
           salesDel(params).then(res => {
             if (res.status == 200) {
             if (res.status == 200) {
               _this.getOrderDetail(true)
               _this.getOrderDetail(true)
+              if(!oosFlag){
+                _this.dataSource = []
+              }
               _this.$message.success(res.message)
               _this.$message.success(res.message)
             }
             }
             _this.spinning = false
             _this.spinning = false
@@ -851,7 +862,7 @@ export default {
       })
       })
     },
     },
     setTableH () {
     setTableH () {
-      this.tableHeight = window.innerHeight - (this.showSearch ? 42 : 0) - 310
+      this.tableHeight = window.innerHeight - (this.showSearch ? 42 : 0) - 300
     },
     },
     pageInit () {
     pageInit () {
       const vm = this
       const vm = this
@@ -917,6 +928,9 @@ export default {
       position: relative;
       position: relative;
       background-color: #fff;
       background-color: #fff;
       height: calc(100% - 60px);
       height: calc(100% - 60px);
+      .choosed-table{
+        position: relative;
+      }
       .redBg-row{
       .redBg-row{
         color: #f5452e;
         color: #f5452e;
         input{
         input{
@@ -924,18 +938,18 @@ export default {
         }
         }
       }
       }
       .discount-box{
       .discount-box{
-        display:flex;
-        align-items:center;
-        padding: 0 0 6px 0;
-        justify-content: flex-end;
-        width:100%;
-        strong{
+        position: absolute;
+        left: 15px;
+        bottom: 15px;
+        .red{
           color: #f5452e;
           color: #f5452e;
+          font-size: 14px;
         }
         }
       }
       }
     }
     }
     .total-bar{
     .total-bar{
       > div{
       > div{
+        text-align: right;
         &:first-child{
         &:first-child{
           span{
           span{
             color: #666;
             color: #666;
@@ -949,9 +963,6 @@ export default {
           display: flex;
           display: flex;
           align-items: center;
           align-items: center;
           justify-content: flex-end;
           justify-content: flex-end;
-          > div{
-            padding: 0 10px;
-          }
         }
         }
       }
       }
     }
     }