Merge remote-tracking branch 'origin/master'

src/views/basic/business/stockOrder.vue

@@ -11,8 +11,8 @@
           <el-col :span="8">
             <el-form-item label="打印状态：" prop="inCodeStatus" clearable>
               <el-select v-model="query.inCodeStatus" style="width: 90%">
-                <el-option label="未打印" :value="1"></el-option>
+                <el-option label="未打印" :value="0"></el-option>
-                <el-option label="已打印" :value="2"></el-option>
+                <el-option label="已打印" :value="1"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -222,7 +222,7 @@ export default {
         limit: 10,
         startTime: "",
         endTime: "",
-        inCodeStatus: 2,
+        inCodeStatus: 1,
       },
       detailQuery: {
         orderIdFk: "",

src/views/basic/product/product.vue

@@ -333,7 +333,7 @@
                         </div>
                       </el-col>
                     </el-row>
-                    <el-row>
+                    <el-row :gutter="20" class="el-row" type="flex">
                       <el-col :span="12" class="el-col">
                         <div class="text item">
                           <div class="itemTag">
@@ -1016,6 +1016,7 @@
             :visible.sync="editDiDialogVisible"
             :close-on-click-modal="false"
             :close-on-press-escape="false"
+            :before-close="this.cancelDialog"
             width="70%"
             v-if="editDiDialogVisible"
           >

src/views/system/print/pdfTmpleateManage.vue

@@ -36,7 +36,7 @@
             {{ moduleNameMap[scope.row.module] }}
           </template>
         </el-table-column>
-        <el-table-column label="更新时间" prop="update_time"></el-table-column>
+<!--        <el-table-column label="更新时间" prop="update_time"></el-table-column>-->
 
         <!--                <el-table-column label="表格行数" prop="rowCount" width="100"></el-table-column>-->
         <!--                <el-table-column label="二维码数量" prop="qrcodeCount" width="125"></el-table-column>-->
@@ -593,9 +593,11 @@ export default {
     submitUpload() {
       if (this.$refs.uploadJasper.uploadFiles.length < 1 && !this.uploadDisabled) {
         this.$message.warning(`请选择jasper文件`);
+        return
       }
       if (this.$refs.uploadJrxml.uploadFiles.length < 1 && !this.uploadDisabled) {
         this.$message.warning(`请选择jasper文件`);
+        return
       }
       console.log(this.formName)
       this.$refs["dataForm"].validate(valid => {