Merge remote-tracking branch 'origin/master'

sample-form-client-ui/admin/src/components/SearchBox.vue

 <template>
   <div class="search-box" :style="{ width }">
     <el-input
-      placeholder="输入关键词查询"
+      placeholder="输入事项表单关键词或排队编号查询"
       :value="value"
       @keyup.native.enter="handleSearch"
       @input="changeInput"

sample-form-client-ui/admin/src/pages/home/Home.vue

@@ -34,7 +34,7 @@
       <div class="search-box">
         <el-input
           v-model="search"
-          placeholder="输入关键词查询"
+          placeholder="输入事项表单关键词或排队编号查询"
           @keyup.native.enter="handleSearch"
         >
           <i

sample-form-manager-ui/admin/src/pages/layouts/components/Header.vue

@@ -71,6 +71,7 @@ export default {
   width: 100%;
   padding: 0px 24px;
   background-color: #2681e8;
+  // background: linear-gradient(90deg, #1845c6 0%, #2999ff 100%);
   color: #fff;
   .title {
     font-size: 16px;
@@ -85,6 +86,7 @@ export default {
 }
 /deep/.el-menu {
   border: none !important;
+  background-color: transparent;
 }
 /deep/.el-menu-item {
   border: none !important;

sample-form-manager-ui/admin/src/pages/software/basics/BasicsSet.vue

@@ -57,10 +57,10 @@
         </el-button>
       </div>
       <div class="mt50">
+        <el-button size="small" @click="handleReset">重置</el-button>
         <el-button size="small" type="primary" @click="handleOk"
           >确定
         </el-button>
-        <el-button size="small" @click="handleReset">重置</el-button>
       </div>
     </el-card>
   </div>

sample-form-manager-ui/admin/src/pages/software/librarymanage/modal/PreviewMaterals.vue

@@ -17,7 +17,7 @@
           type="primary"
           :loading="loading"
           @click="handlePrint(materialsInfo)"
-          >打 印</el-button
+          >下 载</el-button
         >
       </div>
     </el-dialog>
@@ -62,25 +62,10 @@ export default {
   },
   methods: {
     handlePrint(info) {
-      let _this = this;
-      _this.loading = true;
-      /* eslint-disable */
-      device.printer({
-        papertype: "A4",
-        printername: "", // 打印机名称 为空则为默认打印机
-        printertype: "url", // base64 ,normal,url
-        url: this.api2 + info.samplePath, // url
-        success: (res) => {
-          if (res && res.code == "00000") {
-            _this.$message.success("打印成功");
-            _this.loading = false;
-          }
-        },
-        fail: (err) => {
-          _this.$message.error(err.Message);
-          _this.loading = false;
-        },
-      });
+      const a = document.createElement("a");
+      a.href = this.api2 + info.samplePath;
+      a.download = info.sampleName;
+      a.click();
     },
   },
 };

sample-form-manager-ui/admin/src/pages/software/materials/MaterialsManage.vue

@@ -217,6 +217,8 @@
               width="80"
             >
             </el-table-column>
+            <el-table-column prop="sort" label="排序" align="center" width="80">
+            </el-table-column>
             <el-table-column label="操作" align="center" width="180">
               <template slot-scope="scope">
                 <div class="flex jcb">

sample-form-manager-ui/admin/src/pages/software/materials/modal/AddMaterials.vue

@@ -7,7 +7,13 @@
       @close="handleClose"
       :destroy-on-close="true"
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form
+        size="small"
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+      >
         <el-form-item label="材料简称" prop="materialName">
           <el-input
             size="small"
@@ -28,6 +34,14 @@
         <el-form-item label="事项编码">
           <el-input disabled size="small" v-model="form.matterNo"></el-input>
         </el-form-item>
+        <el-form-item label="排序" prop="sort">
+          <el-input-number
+            v-model="form.sort"
+            controls-position="right"
+            :min="0"
+          ></el-input-number>
+        </el-form-item>
+
         <el-form-item label="公共库" prop="pub">
           <el-switch
             class="tableScopeSwitch"
@@ -55,6 +69,7 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="handleRest">重 置</el-button>
         <el-button
           :loading="loading"
           size="small"
@@ -62,7 +77,6 @@
           @click="handleOk"
           >确 定</el-button
         >
-        <el-button size="small" @click="handleRest">重 置</el-button>
       </span>
     </el-dialog>
   </div>
@@ -106,6 +120,7 @@ export default {
         deptName: "", // 部门名称
         deptId: "", // 部门id
         deptCode: "", // 部门编码
+        sort: 99, // 排序
       },
       samplePathFileList: [],
       loading: false,

sample-form-manager-ui/admin/src/pages/software/materials/modal/CommonLib.vue

@@ -82,6 +82,7 @@
         </el-pagination>
       </div>
       <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="Visible = false">取 消</el-button>
         <el-button
           :loading="loading"
           size="small"
@@ -89,7 +90,6 @@
           @click="handleOk"
           >确 定</el-button
         >
-        <el-button size="small" @click="Visible = false">取 消</el-button>
       </span>
     </el-dialog>
   </div>

sample-form-manager-ui/admin/src/pages/software/matter/modal/AddMatter.vue

@@ -48,10 +48,10 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="handleRest">重 置</el-button>
         <el-button size="small" type="primary" @click="handleOk"
           >确 定</el-button
         >
-        <el-button size="small" @click="handleRest">重 置</el-button>
       </span>
     </el-dialog>
   </div>