Merge remote-tracking branch 'origin/master' into test

config/env.json

 {
 {
-   "apiApiHost":"http://10.168.31.142:8060/api",
-   "fileApiUrl":"http://10.168.31.142:80/upload/factory",
-   "visionUrl":"https://console.jomalls.com"
+
+     "apiApiHost":"http://10.168.31.142:8060/api",
+     "fileApiUrl":"http://10.168.31.142:80/upload/factory",
+     "visionUrl":"https://console.jomalls.com"
 }
 }
 
 

package.json

@@ -2,7 +2,7 @@
   "name": "JomallProductionAssistant",
   "name": "JomallProductionAssistant",
   "productName": "JomallProductionAssistant",
   "productName": "JomallProductionAssistant",
   "description": "",
   "description": "",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "private": true,
   "private": true,
   "scripts": {
   "scripts": {
     "serve": "vue-cli-service serve",
     "serve": "vue-cli-service serve",

src/views/design/main/index.vue

@@ -672,6 +672,11 @@ export default {
           });
           });
           break;
           break;
         case "sendFile":
         case "sendFile":
+          if (size.width && size.height) {
+            this.hasSize = true;
+          } else {
+            this.hasSize = false;
+          }
           this.imgList = [];
           this.imgList = [];
           this.selectIndex = -1;
           this.selectIndex = -1;
           if (value.length > 0) {
           if (value.length > 0) {
@@ -779,6 +784,12 @@ export default {
             </div>
             </div>
           </div>
           </div>
           <img class="template-img" draggable="false" :src="img" alt="" />
           <img class="template-img" draggable="false" :src="img" alt="" />
+          <div class="print-tip" v-if="imgList.length">
+            <b style="color: green" v-if="hasSize"
+              >该生产单无需拖动设计，直接打印</b
+            >
+            <b style="color: red" v-else>该生产单需要拖动设计打印</b>
+          </div>
         </div>
         </div>
 
 
         <print-dialog
         <print-dialog
@@ -840,6 +851,12 @@ export default {
 </template>
 </template>
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
+.print-tip {
+  position: absolute;
+  bottom: 130px;
+  font-size: 24px;
+  left: 35%;
+}
 .page-main {
 .page-main {
   flex: 1;
   flex: 1;
   flex-shrink: 0;
   flex-shrink: 0;