提交代码

.idea/.gitignore

@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/

.idea/compiler.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <option name="USE_RELEASE_OPTION" value="false" />
+    <bytecodeTargetLevel target="8" />
+  </component>
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_STRING" value="-encoding utf-8" />
+  </component>
+</project>

.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>

.idea/icore-pass.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/icore-pass.iml" filepath="$PROJECT_DIR$/.idea/icore-pass.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

build/utils.js

@@ -28,8 +28,9 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "appoint", "statisticalReport", "WMS"];
 // let devModules = ["index", "appoint", "inward", "statisticalReport", "RMS"];
 // let devModules = ["index", "appoint", "inward", "TMS"];
-// let devModules = ["all"];
-let devModules = ["index", "appoint", "inward", "queue", "statisticalReport"];
+let devModules = ["all"];
+//let devModules = ["index","RMS","AMS","appoint","sale"];
+//let devModules = ["index", "appoint", "inward", "queue", "statisticalReport","RMS"];
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ["index", "ADMINISTRATORS", "RMS"];
 // let devModules = ["index", "inward", "statisticalReport"];

config/index.js

@@ -65,8 +65,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    // target: "http://172.16.33.166:80",
-    target: "http://localhost:8080",
+    target: "http://172.16.33.166:80",
+    //target: "http://localhost:8080",
     // target: "http://192.168.1.109:8080",
     ws: true,
     pathRewrite: {
@@ -74,8 +74,8 @@ let proxyTable = {
     }
   },
   "/views/api/v1": {
-    // target: "http://172.16.33.166:80",
-    target: "http://192.168.1.109:8080",
+    target: "http://172.16.33.166:80",
+    //target: "http://192.168.1.109:8080",
     ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"

package.json

@@ -148,7 +148,8 @@
     "webpack-bundle-analyzer": "^2.9.0",
     "webpack-dev-server": "^2.9.1",
     "webpack-merge": "^4.1.0",
-    "webpack-node-externals": "^1.7.2"
+    "webpack-node-externals": "^1.7.2",
+    "codemirror": "5.65.5"
   },
   "engines": {
     "node": ">= 6.0.0",

src/components/default.vue

@@ -50,7 +50,7 @@ export default {
         }
     }).catch((err) =>{
         window.top.localStorage.setItem('activeMenu',item.menuId)
-        that.$emit('gotoSetPage', item);           
+        that.$emit('gotoSetPage', item);
     })
     },
     getTop10 () {

src/views/RMS/components/oilPrice.vue

@@ -15,7 +15,7 @@
       </el-button>
     </div>
     <div class="table">
-      <dilTable 
+      <dilTable
         v-bind.sync="options"
         :isKuang="isKuang"
         @func="func"
@@ -109,7 +109,7 @@ export default {
           }
         })
       }).catch(() => {
-        this.$message.info('已取消删除');       
+        this.$message.info('已取消删除');
       });
     },
     onEnable(scope){
@@ -125,12 +125,12 @@ export default {
           }else{
             this.$message({ type: "error", message: "启用失败，请联系管理员!",});
           }
-          
-        }); 
+
+        });
       }).catch(() => {
-        this.$message.info('已取消启用该油价!');       
+        this.$message.info('已取消启用该油价!');
       });
-        
+
     }
   },
 }

src/views/TMS/components/bmstruck/detailsTruckOrder.vue

@@ -57,4 +57,4 @@ export default {
     padding: 1.25rem 1.875rem;
   }
 }
-</style>
+</style>

src/views/sale/components/saleSelfMachine/printReceipt.vue

@@ -86,7 +86,7 @@
         </table>
 
 
-     
+
 
         <!-- tablePart4 -->
         <table
@@ -117,13 +117,13 @@
         >
           <tr>
             <th style="width: 7.62%">备注</th>
-            <td style="width: 20%"></td>
-           
+            <td style="width: 20%">{{note}}</td>
+
           </tr>
         </table>
       </div>
 
-     
+
 
       <div>
         <!-- tablePart6 -->
@@ -238,6 +238,7 @@ export default {
       month: new Date().getMonth() + 1,
       date: new Date().getDate(),
       htmlTitle: "客户换票送货单",
+      note: "",
     };
   },
   created() {
@@ -274,6 +275,7 @@ export default {
           this.town = res.data.town;
           this.deliveryAddress = res.data.deliveryAddress;
           this.deliveryOrderMaterialList = res.data.deliveryOrderMaterialList;
+          this.note=res.data.note;
         });
     },
     backScan() {

src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckDetailOrder.vue

@@ -67,7 +67,7 @@
               @select="handleSelect1"
             >
             </el-autocomplete>
-          </el-form-item> 
+          </el-form-item>
 
           <el-button type="primary" @click="addAddressClick">确定</el-button>
          </el-form>
@@ -88,7 +88,7 @@
           <el-input style="width:250px" v-model="originalAddress" disabled></el-input>
           <label>原单价</label>
           <el-input style="width:100px" v-model="originalPriceValue" disabled></el-input>
-          
+
         </el-form-item>
         <el-form-item label="新详单地址" :label-width="formLabelWidth">
           <el-input style="width:250px" v-model="newAddress" disabled></el-input>
@@ -301,7 +301,7 @@ export default {
           });
         }
       }
-      
+
     },
     onclick(){
       console.log("查询待定值")
@@ -413,4 +413,4 @@ export default {
 			}
   }
 }
-</style>
+</style>