Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/views/WMS/historical-route/index.vue

@@ -167,7 +167,7 @@ export default {
                             //定义经纬度不为0的数组[j]为终点
                             for	(let j = data.length - 1; j > i; j--) {
                                 if (data[j].gpsLatitude != 0 && data[j].gpsLongitude != 0) {
-                                    for (let z = i; z < j; z = z + Math.trunc((j - i) / 2)) {
+                                    for (let z = i; z < j; z = z + Math.trunc((j - i) / 9)) {
                                         // console.log("i",i)
                                         text += `&via[${count}][id][${z}]&via[${count}][lnglat]=${data[z].gpsLongitude},${data[z].gpsLatitude}` ;
                                         this.resData[count] = res.data[z];

src/views/material/changeApply/add.vue

@@ -107,7 +107,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="生产许可证/经营许可证/备案号" prop="remark">
+              <el-form-item label="生产许可证" prop="remark">
                 <el-input :disabled="disable" v-model="basicForm.productionPermit"></el-input>
               </el-form-item>
             </el-col>