修改散货台账 基础资料 财务管理 账务管理

package-lock.json

@@ -4,11 +4,6 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "@amap/amap-jsapi-loader": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz",
-      "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw=="
-    },
     "@babel/code-frame": {
       "version": "7.14.5",
       "resolved": "https://registry.nlark.com/@babel/code-frame/download/@babel/code-frame-7.14.5.tgz",

package.json

@@ -11,7 +11,6 @@
     "test:e2e": "vue-cli-service test:e2e"
   },
   "dependencies": {
-    "@amap/amap-jsapi-loader": "^1.0.1",
     "avue-plugin-ueditor": "^0.1.7",
     "axios": "^0.18.0",
     "babel-polyfill": "^6.26.0",

src/components/amap/main.vue

@@ -1,122 +1,21 @@
 <template>
   <div>
-    <div class="dropdown">
-      <el-input @clear="clear" @input="searchByKeyword" v-model="formattedAddress" clearable
-        placeholder="输入关键字选取地点"></el-input>
-      <div class="dropdown-content" v-if="searchResult.length">
-        <div class="" v-for="item of searchResult" :key="item.id">
-          <div>
-            {{ item.name }}
-          </div>
-        </div>
-      </div>
-
-    </div>
-    <div id="container"></div>
   </div>
 
 </template>
 <script>
-import AMapLoader from "@amap/amap-jsapi-loader";
-import { status } from "nprogress";
 export default {
   name: "map-view",
   data() {
     return {
-      map: null,
-      formattedAddress: null,
-      address: '',
-      poi: {},
-      marker: null,
-      box: false,
-      searchResult: []
     };
   },
   mounted() {
-    this.initAMap();
   },
-  // unmounted() {
-  //   this.map?.destroy();
-  // },
   methods: {
-    clear() {
-      this.poi = {};
-      this.clearMarker();
-    },
-    searchByKeyword(val) {
-      console.log(val)
-      setTimeout(() => {
-        this.autocomplete.search(val, (status, result) => {
-          console.log(status, result)
-          if (status == 'complete' && result.info == 'OK') {
-            this.searchResult = result.tips
-          }
-
-        })
-      }, 500)
-
-    },
-    clearMarker() {
-      if (this.marker) {
-        this.marker.setMap(null);
-        this.marker = null;
-      }
-    },
-    initAMap() {
-      window._AMapSecurityConfig = {
-        securityJsCode: "3d1fa066dcbd64ac5460f63c189f0634",
-      };
-      AMapLoader.load({
-        key: "41a0c8e6cc45f8c76306900bf45a1431", // 申请好的Web端开发者Key，首次调用 load 时必填
-        version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-        plugins: ["AMap.ToolBar", "AMap.Scale", "AMap.PlaceSearch", "AMap.AutoComplete"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-        AMapUI: {
-          version: "1.1", // AMapUI 版本
-        },
-      })
-        .then((AMap) => {
-          this.map = new AMap.Map("container", {
-            // 设置地图容器id
-            viewMode: "2D", // 是否为3D地图模式
-            zoom: 13, // 初始化地图级别
-            center: [116.397428, 39.90923], // 初始化地图中心点位置,
-          });
-          const toolbar = new AMap.ToolBar()
-          this.map.addControl(toolbar)
-          const Scale = new AMap.Scale()
-          this.map.addControl(Scale)
-          var autoOptions = {
-            input: "tipinput"
-          };
-          this.autocomplete = new AMap.AutoComplete(autoOptions);
-          this.placeSearch = new AMap.PlaceSearch({
-            map: this.map
-          });
-        })
-        .catch((e) => {
-          console.log(e);
-        });
-    },
   },
 };
 </script>
 <style scoped>
-#container {
-  width: 80%;
-  height: 600px;
-}
-
-.dropdown {
-  position: relative;
-  display: inline-block;
-}
 
-.dropdown-content {
-  display: none;
-  position: absolute;
-  background-color: #f9f9f9;
-  min-width: 160px;
-  box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
-  z-index: 1;
-}
 </style>

src/views/iosBasicData/VoucherTemplates/index.vue

@@ -142,7 +142,7 @@
                 query: {},
                 loading: true,
                 page: {
-                    pageSize: 10,
+                    pageSize: 20,
                     currentPage: 1,
                     total: 0
                 },

src/views/iosBasicData/bcntrtypes/index.vue

@@ -152,7 +152,7 @@ export default {
         ]
       },
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]

src/views/iosBasicData/bcommodity/index.vue

@@ -76,7 +76,7 @@ export default {
       query: {},
       loading: true,
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]

src/views/iosBasicData/bcorps/index.vue

@@ -175,7 +175,7 @@ export default {
       isShow: true,
       loading: true,
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]

src/views/iosBasicData/bcountrys/index.vue

@@ -91,7 +91,7 @@ export default {
                 ]
             },
             page: {
-                pageSize: 10,
+                pageSize: 20,
                 currentPage: 1,
                 total: 0,
                 pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]

src/views/iosBasicData/bfeesdefine/index.vue

@@ -199,7 +199,7 @@ export default {
         ]
       },
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]

src/views/iosBasicData/blines/index.vue

@@ -163,7 +163,7 @@ export default {
         ]
       },
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]

src/views/iosBasicData/bpackages/index.vue

@@ -146,7 +146,7 @@ export default {
         ]
       },
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]

src/views/iosBasicData/bports/index.vue

@@ -114,7 +114,7 @@ export default {
         ]
       },
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]

src/views/iosBasicData/bserviceterms/index.vue

@@ -146,7 +146,7 @@ export default {
         ]
       },
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]

src/views/iosBasicData/btrademodes/index.vue

@@ -95,7 +95,7 @@ export default {
         ]
       },
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]

src/views/iosBasicData/bunits/index.vue

@@ -88,7 +88,7 @@ export default {
         ]
       },
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]

src/views/iosBasicData/bvessels/index.vue

@@ -164,7 +164,7 @@ export default {
         ]
       },
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]

src/views/iosBasicData/dangerousPackaging/index.vue

@@ -146,7 +146,7 @@ export default {
         ]
       },
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]

src/views/iosBasicData/editypes/index.vue

@@ -87,7 +87,7 @@ export default {
       query: {},
       loading: true,
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0
       },

src/views/iosBasicData/fininvoices/fininvoicesDetails.vue

@@ -426,7 +426,7 @@
                                 <el-button style="margin-left: 10px" :disabled="statusType" size="small" type="primary"
                                     @click="invoiceMatchingfun()">匹配金额</el-button>
                             </div>
-                            <fininvoicesitems ref="fininvoicesitems" :tableData="tableData"
+                            <fininvoicesitems ref="fininvoicesitems" :tableData="tableData" :form="form"
                                 :handleSelectionData="handleSelectionData" :editSave="editSave"
                                 @handleSelectionChange="handleSelectionChange" @deletefun="detailsdeletionfun">
                             </fininvoicesitems>

src/views/iosBasicData/fininvoicesApplyfor/assembly/fininvoicesitems.vue

@@ -135,6 +135,10 @@ export default {
             type: Boolean,
             default: false,
         },
+        form: {
+            type: Object,
+            default: {}
+        }
     },
     data() {
         return {

src/views/iosBasicData/fininvoicesApplyfor/fininvoicesDetails.vue

@@ -424,7 +424,7 @@
                                     @click="invoiceMatchingfun()">匹配金额</el-button>
                             </div>
                             <fininvoicesitems ref="fininvoicesitems" :tableData="tableData"
-                                :handleSelectionData="handleSelectionData" :editSave="editSave"
+                                :handleSelectionData="handleSelectionData" :editSave="editSave" :form="form"
                                 @handleSelectionChange="handleSelectionChange" @deletefun="detailsdeletionfun">
                             </fininvoicesitems>
                         </el-tab-pane>

src/views/iosBasicData/fininvoicesOutput/fininvoicesDetails.vue

@@ -427,7 +427,7 @@
                                     @click="invoiceMatchingfun()">匹配金额</el-button>
                             </div>
                             <fininvoicesitems ref="fininvoicesitems" :tableData="tableData"
-                                :handleSelectionData="handleSelectionData" :editSave="editSave"
+                                :handleSelectionData="handleSelectionData" :editSave="editSave" :form="form"
                                 @handleSelectionChange="handleSelectionChange" @deletefun="detailsdeletionfun">
                             </fininvoicesitems>
                         </el-tab-pane>

src/views/iosBasicData/losbfeestemplate/index.vue

@@ -163,7 +163,7 @@ export default {
         ]
       },
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]

src/views/iosBasicData/psBcorps/index.vue

@@ -173,7 +173,7 @@ export default {
       isShow: true,
       loading: true,
       page: {
-        pageSize: 10,
+        pageSize: 20,
         currentPage: 1,
         total: 0,
         pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]

src/views/landTransportation/bulkReportAnalysis/index.vue

@@ -1018,7 +1018,7 @@ export default {
         this.loadingDialog = true
         let this_ = this
         setTimeout(function () {
-          this_.$refs.playback.initMap();
+          // this_.$refs.playback.initMap();
           this_.loadingDialog = false
         }, 1500)
       })

src/views/tirePartsMall/financialManagement/saleDetail/index.vue

@@ -375,6 +375,10 @@ export default {
                 id: 9,
                 label: '已取消毛利',
                 prop: 'profitCancellation'
+            }, {
+                id: 10,
+                label: '已取消运费',
+                prop: 'freightCancellation'
             }],
         }
     },

src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/index.vue

@@ -11,7 +11,7 @@
             class="itemTable"></avue-crud>
         </template>
         <template slot-scope="{type,size,row,index}" slot="menu">
-          <!-- <el-button :size="size" :type="type" @click="check(row)">查看</el-button> -->
+          <el-button v-if="row.ordNo.includes('RZCG')" :size="size" :type="type" :disabled="true">确认到货</el-button>
           <el-button :size="size" :type="type" :disabled="row.item >= 1"
             @click="$refs.crud.rowDel(row, index)">删除</el-button>
         </template>
@@ -173,7 +173,7 @@ export default {
         searchMenuPosition: "right",
         align: "center",
         size: "small",
-        menuWidth: 50,
+        menuWidth: 120,
         searchSpan: 8,
         searchIcon: true,
         searchIndex: 2,