Merge branch 'release' of...

Merge branch 'release' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into release2.2new

src/views/ecw/banner/index.vue

@@ -326,7 +326,7 @@ export default {
         //上传
         let formData = new FormData();
         formData.append("file", file);
-        formData.append("path", this.uuid());
+        // formData.append("path", this.uuid());
         uploadFile(formData).then(response => {
           this.$set(this.form, 'bannerUrlWeb', response.data);
           // this.form.img = response.data;
@@ -342,7 +342,7 @@ export default {
         //上传
         let formData = new FormData();
         formData.append("file", file);
-        formData.append("path", this.uuid());
+        // formData.append("path", this.uuid());
         uploadFile(formData).then(response => {
           this.$set(this.form, 'bannerUrlApp', response.data);
           // this.form.img = response.data;

src/views/ecw/order/index.vue

@@ -452,7 +452,7 @@
                 <template v-if="
                   exclude(scope.row.status, [0, 2]) &&
                   exclude(scope.row.shipmentState, [320,322,323]) &&
-                  exclude(scope.row.abnormalState, [1, 5,6,7,8])
+                  exclude(scope.row.abnormalState, [5,6,7,8])
                 ">
                   <el-dropdown-item @click.native="printWarehouseReceiptOrderId=scope.row.orderId" v-hasPermi="['ecw:order:warehouse_receipt']">{{$t('打印入仓单')}}</el-dropdown-item>
                 </template>

src/views/ecw/product/index.vue

@@ -601,7 +601,7 @@ export default {
         //上传
         let formData = new FormData();
         formData.append("file", file);
-        formData.append("path", this.uuid());
+        // formData.append("path", this.uuid());
         uploadFile(formData).then(response => {
           this.$set(this.form, 'imgs', response.data);
           // this.form.img = response.data;

src/views/ecw/warehouse/index.vue

@@ -811,7 +811,7 @@ export default {
         //上传
         let formData = new FormData();
         formData.append("file", file);
-        formData.append("path", this.uuid());
+        // formData.append("path", this.uuid());
         uploadFile(formData).then(response => {
           this.$set(this.form, 'img', response.data);
           // this.form.img = response.data;

src/views/system/version/index.vue

@@ -324,7 +324,7 @@ export default {
 
     /** 处理上传的文件发生变化 */
     handleFileChange(file, fileList) {
-      this.upload.data.path = this.uuid() + "/" + file.name;
+      // this.upload.data.path = this.uuid() + "/" + file.name;
     },
 
     /** 文件上传成功处理 */
@@ -355,7 +355,7 @@ export default {
         let formData = new FormData();
         // console.log(file);
         formData.append("file", file);
-        formData.append("path", this.uuid() + "/" + file.name);
+        // formData.append("path", this.uuid() + "/" + file.name);
         uploadFile(formData).then(response => {
           this.$set(this.form, 'appUrl', response.data);
           // this.form.img = response.data;