新增 一次性物流信息 编辑

src/components/disposable/dialog.vue

@@ -4,8 +4,23 @@
     append-to-body
     :visible.sync="dialogObj.show"
     width="800px">
-    <vue-address :province="dialogObj.province" :city="dialogObj.city" :district="dialogObj.district" :detail="dialogObj.detail" :mobile="dialogObj.receive_mobile" :name="dialogObj.receive_name" @change="handlerAddressChange">
-    </vue-address>
+    <el-form label-width="100px" style="margin-top: 20px;">
+      <el-form-item label="收货人" required>
+        <el-input v-model="form.receive_name" type="text"></el-input>
+      </el-form-item>
+      <el-form-item label="收货手机号" required>
+        <el-input v-model="form.receive_mobile" type="text"></el-input>
+      </el-form-item>
+      <el-form-item label="收货地址" required>
+        <el-input v-model="form.receive_address" type="text"></el-input>
+      </el-form-item>
+      <el-form-item label="物流单号">
+        <el-input v-model="form.express_no" type="text"></el-input>
+      </el-form-item>
+      <el-form-item label="物流名称">
+        <el-input v-model="form.express_name" type="text"></el-input>
+      </el-form-item>
+    </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="dialogObj.show = false">取 消</el-button>
       <el-button type="primary" @click="saveAddress">保 存</el-button>
@@ -14,90 +29,80 @@
 </template>
 
 <script>
- import {editDeliverAddressApi} from "../../service/api";
-import vueAddress from '../framework/address-picker/Address'
-import AddressArray from '../framework/address-picker/addr'
+  import {putDisposableApi} from "../../service/api";
+
   export default {
     name: "dialogObj",
-    props:[
+    props: [
       'dialogObj'
     ],
-    data(){
-      return{
+    data() {
+      return {
+        form: {
+
+        }
       }
     },
-    watch:{
-      'dialogObj.show':{
-        deep:true,
-        handler:function(){
+    watch: {
+      'dialogObj.show': {
+        deep: true,
+        handler: function () {
           console.log(this.dialogObj)
+          this.form = JSON.parse(JSON.stringify(this.dialogObj))
         }
       }
     },
-    methods:{
-      handlerAddressChange (val) {
-        if(!val.province || !val.city || !val.district){
+    methods: {
+      saveAddress() {
+
+        if (!this.form.receive_name) {
+          this.$message({
+            type: 'error',
+            message: '请输入收货人名'
+          });
           return
         }
-        this.dialogObj.detail = val.detail;
-        this.dialogObj.province = val.province;
-        this.dialogObj.city = val.city;
-        this.dialogObj.receive_mobile = val.mobile;
-        this.dialogObj.receive_name = val.name;
-        let provinceObj = AddressArray.filter((item) => {
-          return item.value === val.province
-        })
-        let cityObj = provinceObj[0].children.filter((city) => {
-          return city.value === val.city
-        })
-        let districtObj = cityObj[0].children.filter((district) => {
-          return district.value === val.district
-        })
-        this.dialogObj.province_name = provinceObj[0].label;
-        this.dialogObj.city_name = cityObj[0].label;
-        this.dialogObj.district_name = districtObj.length > 0 ? districtObj[0].label : cityObj[0].children[0].label;
-        this.dialogObj.district = districtObj.length > 0 ? districtObj[0].value : cityObj[0].children[0].value;
-      },
-      saveAddress () {
+        if (!this.form.receive_mobile) {
+          this.$message({
+            type: 'error',
+            message: '请输入收货手机号'
+          });
+          return
+        }
+        if (!this.form.receive_address) {
+          this.$message({
+            type: 'error',
+            message: '请输入收货地址'
+          });
+          return
+        }
+
         this.$confirm('确定保存?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
-          }).then(()=>{
+        }).then(() => {
           let json = {
-              province_id: this.dialogObj.province,
-              province_name: this.dialogObj.province_name,
-              city_id: this.dialogObj.city,
-              city: this.dialogObj.city_name,
-              area: this.dialogObj.district_name,
-              area_id: this.dialogObj.district,
-              address: this.dialogObj.detail,
-              receive_name: this.dialogObj.receive_name,
-              receive_mobile: this.dialogObj.receive_mobile
+            deliver_id: this.form.id,
+            receive_address: this.form.receive_address,
+            receive_name: this.form.receive_name,
+            receive_mobile: this.form.receive_mobile,
           };
-            editDeliverAddressApi(this.dialogObj.id,json).then(res=>{
+          this.form.express_no ? json.express_no = this.form.express_no : '';
+          this.form.express_name ? json.express_name = this.form.express_name : '';
+          putDisposableApi(this.form.id, json).then(res => {
             this.$message({
               type: 'success',
               message: '修改成功'
             });
-              this.dialogObj.show=false;
+            this.dialogObj.show = false;
             this.$emit("reflash");
           });
         })
       },
     },
-    components:{
-      vueAddress
-    },
-    mounted(){
+    mounted() {
       console.log(this.dialogObj)
     }
   }
 </script>
-
-<style scoped lang="less">
-  .dialog-footer{
-    display: block;
-    text-align: center;
-  }
-</style>

src/components/disposable/index.vue

@@ -19,7 +19,7 @@
           <div class="search-btn-wrapper">
             <el-button type="primary" plain @click="getList">搜索</el-button>
             <!--<el-button v-if="!$store.state.readonly" type="primary" plain @click="downLoad()">excel模板下载</el-button>-->
-            <el-button type="primary" plain @click="exportTable" v-if="$store.state.export">导出</el-button>
+            <el-button type="success" plain @click="exportTable" v-if="$store.state.export">导出</el-button>
             <el-upload
               style="margin-left: 10px;"
               v-if="$store.state.import"
@@ -73,9 +73,10 @@
       <el-table-column prop="status" label="物流状态">
         <template slot-scope="scope">
           {{scope.row.status|LogisticsStatusFil}}<br/>
-          <template v-if="scope.row.status == 1 && scope.row.express_no">
-            {{scope.row.express_name}}：<a :href="`https://m.baidu.com/from=1013755s/s?word=${scope.row.express_no}&sa=tb&ts=2790568&t_kt=0&ie=utf-8&rsv_t=cbe2F%252FT5T3MIzkRl%252Fg8ZUw%252FEPHZmn2wHIrB8cLvgNlEKyyDqUNPrTyDEEDjkAb8&rsv_pq=11793168499026332712&ss=110000000001&tj=1&rqlang=zh&rsv_sug4=4111&inputT=3178&oq=快递单号查询`" target="_blank">{{scope.row.express_no}}</a>
-          </template>
+          <!--<template v-if="scope.row.status == 1">-->
+            <template v-if="scope.row.express_name">{{scope.row.express_name}}：</template>
+            <a v-if="scope.row.express_no" :href="`https://m.baidu.com/from=1013755s/s?word=${scope.row.express_no}&sa=tb&ts=2790568&t_kt=0&ie=utf-8&rsv_t=cbe2F%252FT5T3MIzkRl%252Fg8ZUw%252FEPHZmn2wHIrB8cLvgNlEKyyDqUNPrTyDEEDjkAb8&rsv_pq=11793168499026332712&ss=110000000001&tj=1&rqlang=zh&rsv_sug4=4111&inputT=3178&oq=快递单号查询`" target="_blank">{{scope.row.express_no}}</a>
+          <!--</template>-->
         </template>
       </el-table-column>
       <el-table-column width="80" label="操作" v-if="!$store.state.readonly" fixed="right">
@@ -86,12 +87,6 @@
     </el-table>
     <page :nowPage="nowPage" :total="total" @pageChange="onPageChange" @sizeChange="onSizeChange"/>
     <address-dialog :dialogObj="dialogObj" @reflash="onUpdateAddress"></address-dialog>
-    <receiveInfoDialog
-      :goodsList="goodsList"
-      :showFlag="showFlag"
-      :cancelEvent="cancelEvent"
-      :sureEvent="sureEvent"
-    />
   </div>
 </template>
 
@@ -102,16 +97,7 @@
   import receiveInfoDialog from "./receiveInfoDialog";
   import Cookie from '../../util/cookie'
   import CommonJs from '../../util/common';
-  import {
-    getDisposableApi,
-    putDisposableApi,
-    getDeliverListApi,
-    getPeriodsApi,
-    getGoodsListApi,
-    getDefaultPeriodsApi,
-    exportExcelApi,
-    getThemeListApi
-  } from "../../service/api";
+  import { getDisposableApi, putDisposableApi } from "../../service/api";
   import {LogisticsStatus, GOODSTYPE} from "../../util/wordbook";
 
   export default {
@@ -178,21 +164,13 @@
       editAddress(row) {
         // this.dialogObj={show:true}
         console.log(row);
-        // if (!row || !row.province_name) {
-        //   this.dialogObj.province = "";
-        //   this.dialogObj.city = "";
-        //   this.dialogObj.district = "";
-        // } else {
-        //   this.dialogObj.province = "";
-        //     this.dialogObj.district = "";
-        //     this.dialogObj.city = "";
-        // }
-        this.dialogObj.detail = row.address;
-        this.dialogObj.receive_mobile = row.receive_mobile;
-        this.dialogObj.receive_name = row.receive_name;
-        this.dialogObj.province_name = "";
-        this.dialogObj.city_name = "";
-        this.dialogObj.district_name = "";
+        //if (row.status == 1) {
+          this.dialogObj.express_no = row.express_no || '';
+          this.dialogObj.express_name = row.express_name || '';
+        //}
+        this.dialogObj.receive_address = row.receive_address || '';
+        this.dialogObj.receive_mobile = row.receive_mobile || '';
+        this.dialogObj.receive_name = row.receive_name || '';
         this.dialogObj.id = row.id;
         this.dialogObj.show = true;
       },