调整

src/api/sales.js

@@ -125,3 +125,18 @@ export function detailRefund(params) {
     params
   })
 }
+
+export function signIn(params) {
+  return request({
+    url: '/customer/frontOrder/signIn',
+    method: 'get',
+    params
+  })
+}
+export function listOrder(params) {
+  return request({
+    url: '/customer/frontOrder/listOrder',
+    method: 'post',
+    data: params
+  })
+}

src/views/sales_control/sales_management/components/customer_sales_details.vue

@@ -2,7 +2,7 @@
   <div>
     <el-page-header @back="$parent.pageType=0" content="详情" style=" padding: 20px 20px 0 20px;"></el-page-header>
     <sales-header ref="header" />
-    <sales-table :dataList="dataList" :column="column"   @handleSelection="handleSelection">
+    <sales-table :dataList="dataList" :column="column" @handleSelection="handleSelection">
       <!--      <template #bts>-->
       <!--        <div>-->
       <!--          <el-button type="primary" size="mini" @click="dialogVisible=true">添加</el-button>-->
@@ -10,16 +10,17 @@
       <!--        </div>-->
       <!--      </template>-->
       <template #events>
-        <div v-if="details.status==1 || details.status==2">
+        <div v-if="details.status==1">
           <el-button type="primary" size="mini" @click="handleInform(2)">通知发货</el-button>
-<!--          <el-button size="mini" v-if="">撤销发货</el-button>-->
         </div>
-        <div v-if="details.status==3">
+        <div v-if=" details.status==2">
           <el-button type="primary" size="mini" @click="handleInform(3)">发货</el-button>
+        </div>
+        <div v-if="details.status==3">
           <el-button size="mini">撤销发货</el-button>
         </div>
-        <div v-if="details.status==4">
-          <el-button type="primary" size="mini" @click="handleInform(4)">签收</el-button>
+        <div v-if="isFront===false && details.status==2">
+          <el-button type="primary" size="mini" @click="handleSignIn(4)">签收</el-button>
         </div>
       </template>
       <template v-slot:custom="{item:{row,$index}}">
@@ -83,7 +84,7 @@
 import SalesDialog from '@/components/SalesDialog/SalesDialog'
 import SalesHeader from '@/components/SalesHeader/SalesHeader'
 import SalesTable from '@/components/SalesTable/SalesTable'
-import { addFrontOrder, getFrontOrderDetail, sbumitFrontOrder } from '@/api/sales'
+import { addFrontOrder, getFrontOrderDetail, sbumitFrontOrder, signIn } from '@/api/sales'
 import { getcustomerFrontList } from '@/api/stock'
 
 export default {
@@ -126,7 +127,7 @@ export default {
         {
           prop: 'qty',
           label: '数量',
-          width: '180',
+          width: '180'
         },
         {
           prop: 'volume',
@@ -141,7 +142,7 @@ export default {
         {
           prop: 'notes',
           label: '备注',
-          width: '180',
+          width: '180'
 
         }
       ],
@@ -155,7 +156,8 @@ export default {
       }, {
         content: '创建成功',
         timestamp: '2018-04-11'
-      }]
+      }],
+      isFront: JSON.parse(localStorage.getItem('supply_user')).isFront,
 
     }
   },
@@ -237,6 +239,13 @@ export default {
         this.$parent.pageType = 0
 
       })
+    },
+    handleSignIn(status){
+      signIn({id: this.$refs.header.screenForm.id, status }).then(res=>{
+        this.$successMsg('签收')
+        this.$parent.pageType = 0
+
+      })
     }
 
   }

src/views/sales_control/sales_management/components/customer_sales_form.vue

@@ -45,7 +45,7 @@
 import SalesDialog from '@/components/SalesDialog/SalesDialog'
 import SalesHeader from '@/components/SalesHeader/SalesHeader'
 import SalesTable from '@/components/SalesTable/SalesTable'
-import { addFrontOrder, getFrontOrderDetail, sbumitFrontOrder, updateFrontOrder } from '@/api/sales'
+import { addFrontOrder, getFrontOrderDetail, listOrder, sbumitFrontOrder, updateFrontOrder } from '@/api/sales'
 import { getcustomerFrontList, getFrontListCustomer } from '@/api/stock'
 
 export default {
@@ -136,13 +136,13 @@ export default {
 
     getDialogList(p) {
       let func = getcustomerFrontList
-      if (this.isFront === true) {
-        func = getcustomerFrontList
-      }
-      if (this.isFront === false) {
-        func = getFrontListCustomer
-      }
-      return func(...p)
+      // if (this.isFront === true) {
+      //   func = getcustomerFrontList
+      // }
+      // if (this.isFront === false) {
+      //   func = getFrontListCustomer
+      // }
+      return listOrder(...p)
     },
     confirm(selected) {
       console.log(selected)

src/views/sales_control/sales_management/components/return_sales_form.vue

@@ -50,7 +50,7 @@ import {
   getFrontOrderList,
   sbumitFrontOrder,
   sendRefund,
-  updateRefund
+  updateRefund, listOrder
 } from '@/api/sales'
 import { getcustomerFrontList, getFrontListCustomer } from '@/api/stock'
 
@@ -140,14 +140,14 @@ export default {
 
   methods: {
     getDialogList(p) {
-      let func = getcustomerFrontList
-      if (this.isFront===true){
-        func = getcustomerFrontList
-      }
-      if (this.isFront===false){
-        func = getFrontListCustomer
-      }
-      return getFrontOrderList(...p)
+      // let func = getcustomerFrontList
+      // if (this.isFront===true){
+      //   func = getcustomerFrontList
+      // }
+      // if (this.isFront===false){
+      //   func = getFrontListCustomer
+      // }
+      return listOrder(...p)
     },
     confirm(selected) {
       console.log(selected)

src/views/sales_control/sales_management/customer_sales_list.vue

@@ -105,26 +105,32 @@ export default {
             >
               查看
             </el-button>
-            <el-button
-              size="mini"
-              type="text" onClick={() => {
-              this.detailsId = row.id
-              this.pageType = 2
-            }}
-            >
-              编辑
-            </el-button>
-            <el-popconfirm
-              onOnConfirm={() => {
-                delFrontOrder({ id: row.id }).then(res => {
-                  this.$successMsg('删除成功')
-                  this.$refs.pageRef.refreshList()
-                })
+
+            {
+              row.status == 1 ? (<el-button
+                size="mini"
+                type="text" onClick={() => {
+                this.detailsId = row.id
+                this.pageType = 2
               }}
-              title="删除吗？"
-            >
-              <el-button slot="reference" size="mini" type="text">删除</el-button>
-            </el-popconfirm>
+              >
+                编辑
+              </el-button>) : null}
+            {
+              row.status == 1 ?
+                (<el-popconfirm
+                  onOnConfirm={() => {
+                    delFrontOrder({ id: row.id }).then(res => {
+                      this.$successMsg('删除成功')
+                      this.$refs.pageRef.refreshList()
+                    })
+                  }}
+                  title="删除吗？"
+                >
+                  <el-button slot="reference" size="mini" type="text">删除</el-button>
+                </el-popconfirm>)
+                : null
+            }
           </div>
         )
       }

src/views/sales_control/sales_management/return_sales_list.vue

@@ -12,8 +12,8 @@
       :optionsEvensGroup="optionsEvensGroup"
     >
     </template-page>
-    <return_sales_form v-else-if="pageType===1 || pageType ===2" :details-id="detailsId"/>
-    <return_sales_details v-else :details-id="detailsId"/>
+    <return_sales_form v-else-if="pageType===1 || pageType ===2" :details-id="detailsId" />
+    <return_sales_details v-else :details-id="detailsId" />
   </div>
 </template>
 
@@ -23,22 +23,23 @@ import import_mixin from '@/components/template/import_mixin.js'
 import { delDeleteRefund, exportRefund, getFrontOrderListRefund } from '@/api/sales'
 import return_sales_form from '@/views/sales_control/sales_management/components/return_sales_form'
 import return_sales_details from '@/views/sales_control/sales_management/components/return_sales_details'
+
 export default {
-  components: { TemplatePage,return_sales_form,return_sales_details },
+  components: { TemplatePage, return_sales_form, return_sales_details },
   mixins: [import_mixin],
   data() {
     return {
-      detailsId:'',
-      pageType:0,
+      detailsId: '',
+      pageType: 0,
       // 事件组合
       optionsEvensGroup: [
         [
           [
             {
               name: '新增',
-              click: ()=>{
+              click: () => {
                 this.pageType = 1
-                this.detailsId =''
+                this.detailsId = ''
               }
             }
           ]
@@ -47,7 +48,7 @@ export default {
           [
             {
               name: '编辑',
-              click: ()=>{
+              click: () => {
                 this.pageType = 1
               }
             }
@@ -104,26 +105,27 @@ export default {
             >
               查看
             </el-button>
-            <el-button
-              size="mini"
-              type="text" onClick={() => {
+
+            {row.status == 1 ? (<el-button size="mini"
+                                           type="text" onClick={() => {
               this.detailsId = row.id
               this.pageType = 2
             }}
             >
               编辑
-            </el-button>
-            <el-popconfirm
-              onOnConfirm = {()=>{
+            </el-button>) : null}
+            {row.status == 1 ? (<el-popconfirm
+              onOnConfirm={() => {
                 delDeleteRefund({ id: row.id }).then(res => {
                   this.$successMsg('删除成功')
-                  this.$refs.pageRef.refreshList();
+                  this.$refs.pageRef.refreshList()
 
-                })              }}
+                })
+              }}
               title="删除吗？"
             >
               <el-button slot="reference" size="mini" type="text">删除</el-button>
-            </el-popconfirm>
+            </el-popconfirm>) : null}
           </div>
         )
       }