修改 20210701

public/config.js

@@ -7,6 +7,6 @@
     config = {
         // API_URL: 'http://172.119.50.248:8081',
         // API_URL: 'http://61.135.192.50:8081',
-        API_URL: 'http://fw.niulanshan.com.cn:8081',
+        API_URL: 'http://172.119.51.195:8081',
     }
     

src/views/get/addCancel.vue

@@ -112,11 +112,6 @@ export default {
     data() {
 
         return {
-            AllData:{
-                sendTotal:'90000万',
-                getTotal:'40000万',
-                otherTotal:'50000万',
-            },
             form:{
                 num:this.$route.query.ids || 'FMD_'+getDay2()+'_'+Math.floor(Math.random()*10000),
                 theGetTime:this.$route.query.times || getDayTime(),

src/views/get/deliverGoods.vue

@@ -19,7 +19,7 @@
                 :data="paramsForm.params"
                 style="width: 100%">
                 <el-table-column
-                    label="收货公司"
+                    label="送货公司"
                     >
                     <template slot-scope="scope">
                         <el-form-item
@@ -31,6 +31,17 @@
                         </el-form-item>
                     </template>
                 </el-table-column>
+                <el-table-column
+                    label="收货公司"
+                    >
+                    <template slot-scope="scope">
+                        <el-form-item
+                            :prop="'params.' + scope.$index + '.receive_company'"
+                            :rules="paramsForm.paramsRules.receive_company">
+                            <el-input v-model.number="scope.row.receive_company" size="small"></el-input>
+                        </el-form-item>
+                    </template>
+                </el-table-column>
                 <el-table-column
                     label="送货时间"
                     >
@@ -138,6 +149,9 @@ export default {
                     sent_count:[
                         {required: true,type:'number', message: '请输入送货数量', trigger: 'blur'}
                     ],
+                    receive_company:[
+                        {required: true,type:'number', message: '请输入收货公司名称', trigger: 'blur'}
+                    ],
                     receipt:[
                         {required: true, validator: checkPhotoOpe, trigger: "blur"}
                     ]
@@ -160,7 +174,7 @@ export default {
             })
         },
         addRowData(){
-            this.paramsForm.params.push({sent_time:null,sent_count:null,whitelist_id:null,receipt:null,origin_filename:null})
+            this.paramsForm.params.push({sent_time:null,sent_count:null,receive_company:null,whitelist_id:null,receipt:null,origin_filename:null})
         },
         deleteData(index){
             this.paramsForm.params.splice(index,1)

src/views/get/getDetail.vue

@@ -18,12 +18,13 @@
         <el-table :data="tableData" style="width: 100%" header-row-class-name="">
             <el-table-column prop="whitelistName" label="公司名称"></el-table-column>
             <el-table-column prop="summary" label="摘要"></el-table-column>
-            <el-table-column prop="fetch_count" label="取码数（万）"></el-table-column>
+            <el-table-column prop="fetch_count" label="取码数"></el-table-column>
         </el-table>
         <br><br>
         <label>送码详情</label>
         <el-table :data="tableData2" style="width: 100%" header-row-class-name="">
-            <el-table-column prop="whitelistName" label="收货公司"></el-table-column>
+            <el-table-column prop="whitelistName" label="送货公司"></el-table-column>
+            <el-table-column prop="receive_company " label="收货公司"></el-table-column>
             <el-table-column prop="sent_time" label="送货时间"></el-table-column>
             <el-table-column prop="sent_count" label="送货数量（盘）"></el-table-column>
             <el-table-column prop="receipt" label="送货回执单">

src/views/get/returnReceipt.vue

@@ -27,7 +27,7 @@
             <el-table-column prop="fetchCount" label="取码数"></el-table-column>
             <el-table-column label="操作" width="200">
                 <template slot-scope="scope">
-                    <el-button type="text" size="small" @click="deliverGoods(scope.row.fetchId,scope.row.fetchTime,scope.row.fetchCount)">送货</el-button>
+                    <el-button type="text" size="small" @click="deliverGoods(scope.row.fetchId,scope.row.fetchTime,scope.row.fetchCount)">创建送货单</el-button>
                     <el-button type="text" size="small" @click="showDetail(scope.row.fetchId)">查看</el-button>
                 </template>
             </el-table-column>

src/views/send/send.vue

@@ -79,7 +79,7 @@
             <br>
             <el-table :data="tableData" style="width: 100%" header-row-class-name="">
                 <el-table-column prop="account" label="取码单号"></el-table-column>
-                <el-table-column prop="enIdText" label="取码数（万）"></el-table-column>
+                <el-table-column prop="enIdText" label="取码数"></el-table-column>
                 <el-table-column label="操作" width="200">
                     <template slot-scope="scope">
                         <el-button type="text" size="small" @click="showGetDetail(scope.row.id)"><i class="el-icon-edit"></i>查看</el-button>

src/views/status/goodsCount.vue

@@ -21,7 +21,7 @@
         <el-table :data="tableData" style="width: 100%" header-row-class-name="">
             <el-table-column prop="fetchId" label="取码单号"></el-table-column>
             <el-table-column prop="fetchTime" label="取码日期"></el-table-column>
-            <el-table-column prop="fetchCount" label="取码数（万）"></el-table-column>
+            <el-table-column prop="fetchCount" label="取码数"></el-table-column>
             <el-table-column prop="printCount" label="印码数"></el-table-column>
             <el-table-column prop="sentBand" label="已送货胶带数"></el-table-column>
             <el-table-column prop="unPrintCount" label="未印制码数"></el-table-column>

src/views/status/sendStatus.vue

@@ -21,10 +21,10 @@
         </div>
         <el-table :data="tableData" style="width: 100%" header-row-class-name="">
             <el-table-column prop="time" label="日期"></el-table-column>
-            <el-table-column prop="send_count" label="发码数（万）"></el-table-column>
+            <el-table-column prop="send_count" label="发码数"></el-table-column>
-            <el-table-column prop="fetch_count" label="领码数（万）"></el-table-column>
+            <el-table-column prop="fetch_count" label="领码数"></el-table-column>
             <el-table-column prop="discard_count" label="废码数"></el-table-column>
-            <el-table-column prop="send_remainder" label="发码剩余（万）"></el-table-column>
+            <el-table-column prop="send_remainder" label="发码剩余"></el-table-column>
             <el-table-column label="操作" width="200">
                 <template slot-scope="scope">
                     <el-button type="text" size="small" v-if="scope.row.type != 1" @click="showDetail(scope.row.real_id,scope.row.type)">查看</el-button>
@@ -54,7 +54,7 @@
             <br>
             <el-table :data="tableData" style="width: 100%" header-row-class-name="">
                 <el-table-column prop="a" label="取码单号"></el-table-column>
-                <el-table-column prop="b" label="取码数（万）"></el-table-column>
+                <el-table-column prop="b" label="取码数"></el-table-column>
                 <el-table-column label="操作" width="200">
                     <template slot-scope="scope">
                         <el-button type="text" size="small" @click="showGetDetail(scope.row.id)"><i class="el-icon-edit"></i>查看</el-button>