lilei před 3 roky
rodič
revize
068fbd9583

+ 1 - 1
src/layouts/BasicLayout.vue

@@ -197,7 +197,7 @@ export default {
     }
     this.collapsed = !this.sidebarOpened
     this.$store.dispatch('ToggleMultiTab', true)
-	  this.$store.dispatch('ToggleColor', '#2a86f4')
+	  // this.$store.dispatch('ToggleColor', '#2A86F4')
     this.$store.dispatch('ToggleTheme', 'dark')
     // 判断是否是当月25日后
     this.$store.state.app.isLastDayForMonth = moment().date() >= 25

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

@@ -96,7 +96,7 @@
                 </template>
                 <!-- 包装数 -->
                 <template slot="baozh" slot-scope="text, record">
-                  4支/盒
+                  {{ record.packQty||'--' }}
                 </template>
                 <!-- 产品编码 -->
                 <template slot="code" slot-scope="text, record">
@@ -286,7 +286,7 @@ export default {
         { title: '产品名称', dataIndex: 'name', width: '23%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'origCode', width: '14%', align: 'center', customRender: function (text) { return text && text != ' ' ? text : '--' } },
         { title: '单位', dataIndex: 'unit', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '包装数', scopedSlots: { customRender: 'baozh' }, width: '10%', align: 'center' },
+        { title: '包装数', scopedSlots: { customRender: 'baozh' }, width: '5%', align: 'center' },
         { title: '成本价', dataIndex: 'purchasePrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
         { title: '终端会员价', dataIndex: 'terminalPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
         { title: '车主零售价', dataIndex: 'carOwnersPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },

+ 7 - 6
src/views/salesManagement/salesQuery/edit.vue

@@ -83,9 +83,9 @@
             </a-col>
             <a-col :span="8">
               <div style="float:right;overflow: hidden;">
-                <a-checkbox :value="0" :checked="tbForm.indexOf(0)>=0" @change="(e)=>{tbFormChange(e,0)}" id="salesQuery-tbsh">同步审核</a-checkbox>
-                <a-checkbox :value="1" :checked="tbForm.indexOf(1)>=0" @change="(e)=>{tbFormChange(e,1)}" id="salesQuery-tbck">同步出库</a-checkbox>
-                <a-checkbox :value="2" :checked="tbForm.indexOf(2)>=0" @change="(e)=>{tbFormChange(e,2)}" id="salesQuery-tbsk">同步收款</a-checkbox>
+                <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>
                 <a-button
                   style="padding: 0 25px;"
                   type="primary"
@@ -263,11 +263,11 @@ export default {
       })
     },
     tbFormChange (e, val) {
-      console.log(`checked = ${e.target.checked}`, val)
       this.tbForm = []
+      const tbTypes = ['AUDIT', 'STOCK_OUT', 'SETTLE']
       if (e.target.checked) {
         for (let i = val; i >= 0; i--) {
-          this.tbForm.push(i)
+          this.tbForm.push(tbTypes[i])
         }
       } else {
         this.tbForm = []
@@ -570,7 +570,8 @@ export default {
     // 提交销售单
     handleSubmit () {
       this.spinning = true
-      salesWriteSubmit({ id: this.orderId }).then(res => {
+      const submitTypes = this.tbForm.join(',')
+      salesWriteSubmit({ id: this.orderId, submitTypes: submitTypes }).then(res => {
         if (res.status == 200) {
           this.handleBack()
           this.$message.success(res.message)

+ 6 - 6
src/views/salesManagement/salesQuery/list.vue

@@ -242,7 +242,7 @@ export default {
         { title: '序号', dataIndex: 'no', align: 'center', width: '4%' },
         { title: '来源', dataIndex: 'salesBillSourceDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '9%', align: 'center' },
-        { title: '客户名称', dataIndex: 'buyerName', align: 'center', width: '10%', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'buyerName', align: 'center', width: '15%', customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'totalCategory', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总售价', dataIndex: 'totalAmount', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -250,12 +250,12 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核', scopedSlots: { customRender: 'audit' }, width: '3%', align: 'center' },
-        { title: '急件', scopedSlots: { customRender: 'oosFlag' }, width: '3%', align: 'center' },
-        { title: '出库', scopedSlots: { customRender: 'waitOut' }, width: '3%', align: 'center' },
-        { title: '收款', scopedSlots: { customRender: 'financial' }, width: '3%', align: 'center' },
+        { title: '审核', scopedSlots: { customRender: 'audit' }, width: '2%', align: 'center' },
+        { title: '急件', scopedSlots: { customRender: 'oosFlag' }, width: '2%', align: 'center' },
+        { title: '出库', scopedSlots: { customRender: 'waitOut' }, width: '2%', align: 'center' },
+        { title: '收款', scopedSlots: { customRender: 'financial' }, width: '2%', align: 'center' },
         // { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 2 - 2
src/views/salesManagement/salesReturn/list.vue

@@ -86,7 +86,7 @@
           <a-button
             size="small"
             type="link"
-            class="button-warning"
+            class="button-primary"
             v-if="record.state == 'WAIT_AUDIT'&&$hasPermissions('B_salesReturnAudit')"
             @click="handleEexamine(record)"
             id="salesReturn-eexamine-btn">审核</a-button>
@@ -94,7 +94,7 @@
             size="small"
             v-if="(record.state == 'WAIT_AUDIT'||record.state == 'WAIT_SUBMIT') &&$hasPermissions('B_salesReturnEdit')"
             type="link"
-            class="button-info"
+            class="button-primary"
             @click="handleEdit(record)"
             id="salesReturn-edit-btn">编辑</a-button>
           <a-button

+ 17 - 15
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -21,7 +21,7 @@
           :warehouseCascadeData="warehouseCascadeData"
           @add="saveProduct"></queryPart>
       </a-card>
-      <a-card size="small" :bordered="false" class="pages-wrap">
+      <a-card size="small" :bordered="false" class="pages-wrap" ref="tableWrap">
         <!-- alert -->
         <a-alert style="margin-bottom: 10px;" type="info">
           <div slot="message" class="total-bar">
@@ -73,8 +73,15 @@
               <div style="float:right;overflow: hidden;">
                 <!-- <a-button id="salesReturn-dru">导入明细</a-button> -->
                 <a-button
-                  size="small"
+                  style="padding: 0 25px;"
                   type="primary"
+                  :disabled="spinning"
+                  class="button-primary"
+                  @click="handleSubmit()"
+                  id="salesReturn-handleSubmit">提交</a-button>
+                <a-button
+                  size="small"
+                  type="link"
                   @click="salesReturnDelAll"
                   :loading="delLoading"
                   style="margin-left: 10px"
@@ -93,7 +100,7 @@
           :data="loadData"
           :defaultLoadData="false"
           :pageSize="10"
-          :scroll="{ y: 300 }"
+          :scroll="{ y: 200 }"
           bordered>
           <!-- 本次退货数量 -->
           <template slot="qty" slot-scope="text, record">
@@ -164,16 +171,7 @@
         </s-table>
       </a-card>
     </a-spin>
-    <div class="affix-cont">
-      <a-button
-        size="large"
-        style="padding: 0 60px;"
-        type="primary"
-        :disabled="spinning"
-        class="button-primary"
-        @click="handleSubmit()"
-        id="salesReturn-handleSubmit">提交</a-button>
-    </div>
+    <!-- <div class="affix-cont"></div> -->
     <!-- 选择客户弹框 -->
     <choose-custom-modal :show="openModal" @ok="chooseCustomOk" @cancel="openModal=false"></choose-custom-modal>
   </div>
@@ -538,11 +536,15 @@ export default {
   .salesReturnEdit-wrap{
     position: relative;
     height: 100%;
-    padding-bottom: 51px;
     box-sizing: border-box;
     >.ant-spin-nested-loading{
-      overflow-y: scroll;
       height: 100%;
+      > div{
+        height: 100%;
+        overflow-y: auto;
+        display: flex;
+        flex-direction: column;
+      }
     }
     .pages-wrap{
       margin-top: 10px;

+ 10 - 13
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -74,8 +74,15 @@
               <div style="float:right;overflow: hidden;">
                 <!-- <a-button id="salesReturn-dru">导入明细</a-button> -->
                 <a-button
-                  size="small"
+                  style="padding: 0 25px;"
                   type="primary"
+                  :disabled="spinning"
+                  class="button-primary"
+                  @click="handleSubmit()"
+                  id="salesReturn-handleSubmit">提交</a-button>
+                <a-button
+                  size="small"
+                  type="link"
                   @click="salesReturnDelAll"
                   :loading="delLoading"
                   style="margin-left: 10px"
@@ -151,16 +158,7 @@
         </s-table>
       </a-card>
     </a-spin>
-    <div class="affix-cont">
-      <a-button
-        size="large"
-        style="padding: 0 60px;"
-        type="primary"
-        :disabled="spinning"
-        class="button-primary"
-        @click="handleSubmit()"
-        id="salesReturn-handleSubmit">提交</a-button>
-    </div>
+    <!-- <div class="affix-cont"></div> -->
     <!-- 选择客户弹框 -->
     <choose-custom-modal :show="openModal" @ok="chooseCustomOk" @cancel="openModal=false"></choose-custom-modal>
   </div>
@@ -521,10 +519,9 @@ export default {
   .salesReturnEdit-wrap{
     position: relative;
     height: 100%;
-    padding-bottom: 51px;
     box-sizing: border-box;
     >.ant-spin-nested-loading{
-      overflow-y: scroll;
+      overflow-y: auto;
       height: 100%;
     }
     .pages-wrap{