Merge remote-tracking branch 'origin/master'

src/views/system/dept/authDept.vue

@@ -249,6 +249,7 @@
             <template slot-scope="scope">
               <el-button
                 type="text"
+                :disabled="scope.row.userId == 1"
                 @click.native.stop="removeUserDialog(scope.row)"
                 >移除
               </el-button>

src/views/system/dept/invWarehouse.vue

@@ -17,7 +17,7 @@
           ></el-input>
         </el-form-item> -->
         <el-form-item label="仓库类型" prop="advanceType">
-          <el-select v-model="subData.advanceType" placeholder="请选择仓库类型" style="width: 80%">
+          <el-select v-model="subDataType.advanceType" placeholder="请选择仓库类型" style="width: 80%">
             <el-option label="入账库" :value="1"/>
             <el-option label="预验收库" :value="2"/>
             <el-option label="寄售库" :value="3"/>
@@ -458,6 +458,7 @@ export default {
         ]
       },
       subData: {},
+      subDataType:{},
       fromDeptOptions: [],
       invOptions: [],
       thirdSubQuery: {
@@ -495,6 +496,7 @@ export default {
         name: "",
         status: "",
       };
+      this.subDataType.advanceType=null;
       this.getList();
 
       //置空用户列表和货位信息列表的参数
@@ -507,6 +509,7 @@ export default {
     },
 
     onSubmit() { //提交查询
+      this.query.advanceType=this.subDataType.advanceType;
       this.getList();
     },
 

src/views/system/print/pdfBizPrintSet.vue

@@ -473,9 +473,8 @@ export default {
       };
       this.moduleFormVisible = true;
       this.selectTemplateQuery = {
-        module: row.templateType,
+        module: 2,
         busRlId: row.id,
-        type: 1,
         name: "",
         page: 1,
         limit: 10

src/views/system/print/pdfCodePrintSet.vue

@@ -458,7 +458,7 @@ export default {
       };
       this.moduleFormVisible = true;
       this.selectTemplateQuery = {
-        module: row.templateType,
+        module: 2,
         name: "",
         page: 1,
         limit: 20
@@ -473,7 +473,7 @@ export default {
       };
       this.moduleFormVisible = true;
       this.selectTemplateQuery = {
-        module: row.templateType,
+        module: 2,
         busRlId: row.id,
         type: 1,
         name: "",

src/views/system/print/pdfLabelPrintSet.vue

@@ -458,7 +458,7 @@ export default {
       };
       this.moduleFormVisible = true;
       this.selectTemplateQuery = {
-        module: row.templateType,
+        module: 0,
         name: "",
         page: 1,
         limit: 20
@@ -473,7 +473,7 @@ export default {
       };
       this.moduleFormVisible = true;
       this.selectTemplateQuery = {
-        module: row.templateType,
+        module: 0,
         busRlId: row.id,
         type: 1,
         name: "",

src/views/system/print/pdfStatementPrintSet.vue

@@ -458,7 +458,7 @@ export default {
       };
       this.moduleFormVisible = true;
       this.selectTemplateQuery = {
-        module: row.templateType,
+        module: 1,
         name: "",
         page: 1,
         limit: 20
@@ -473,7 +473,7 @@ export default {
       };
       this.moduleFormVisible = true;
       this.selectTemplateQuery = {
-        module: row.templateType,
+        module: 1,
         busRlId: row.id,
         type: 1,
         name: "",