试验规范修改

src/views/codeRule/ruleManage.vue

@@ -343,39 +343,41 @@
           </el-table-column>
           <el-table-column property="name" label="文件名称" v-if="!isShowList" >
             <template slot-scope="scope">
+              <div  style="display: flex; ">
+                <el-input v-model="scope.row.standardFile.fileName" placeholder="请输入内容"></el-input>
               
-              <el-input v-model="scope.row.standardFile.fileName" placeholder="请输入内容"></el-input>
-              <el-button
-                type="text"
-                size="small"
-                style="color: rgb(219, 55, 55);"
-                @click="delFile(scope.row,scope.$index )"
-              >
-                <i class="el-icon-delete"></i> 删除
-    </el-button>
+                    <el-button
+                      type="text"
+                      size="small"
+                      style="color: rgb(219, 55, 55);"
+                      @click="delFile(scope.row,scope.$index )"
+                    >
+                  <i class="el-icon-delete"></i> 
+                </el-button>
+              </div>
             </template>
 
           </el-table-column>
           
-          <el-table-column label="操作" width="200">
+          <el-table-column label="操作" width="150">
             <template slot-scope="scope">
         
        
            
+             <div style="display: flex; ">
               <el-upload
-              v-if="!isShowList"
+                v-if="!isShowList"
                 class="upload-demo"
                 action="#"
-                 :on-change="file => handleFileUpload(file, scope.row, scope.$index)"
+                :on-change="file => handleFileUpload(file, scope.row, scope.$index)"
                 :before-upload="beforeUpload"
                 :show-file-list="false"
                 :auto-upload="false"
               >
-                 <el-button size="small" type="text">文件上传</el-button>
+                <el-button size="small" type="text" style="margin-right: 5px;">上传文件</el-button>
               </el-upload>
-             
-         
-              <el-button type="text" size="small" style="color: rgb(219, 55, 55);" @click="delManange(scope.$index,scope.row)">删除</el-button>
+              <el-button type="text" size="small" style="color: rgb(219, 55, 55);" @click="delManange(scope.$index, scope.row)">删除</el-button>
+            </div>
             </template>
 
           </el-table-column>
@@ -421,7 +423,7 @@
               action="#"
               :file-list="fileForm.standardFileUrl"
               :on-change="uploadImportData"
-           
+               accept=".pdf, application/pdf"
               >
               <el-button size="small" type="primary">点击上传</el-button>
               <div slot="tip" class="el-upload__tip">允许文件格式.pdf</div>
@@ -1210,8 +1212,10 @@ import { getStore, setStore } from "@/util/store";
       addBasicInfo1(index) {
        this.jsDetail.info.splice(index + 1, 0, { name: '', select: '' });
       },
-      addJsForm() {
-        const isValid = this.$refs.jsFormRef.validate();
+     async addJsForm() {
+        const isValid = await this.$refs.jsFormRef.validate();
+
+        
         if (!isValid) {
           this.$message.error('请填写完整的技术指标信息');
           return;

src/views/manager/projectinfo/codeSet.vue

@@ -89,8 +89,8 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="是否自增">
-          <template slot-scope="scope">
+        <el-table-column label="是否自增" >
+          <template slot-scope="scope" v-if="scope.row.rule==6">
              <el-checkbox v-model="scope.row.isAutoIncrement" v-if="scope.row.rule==6&&scope.row.isEdit" :true-label="1" :false-label="0" ></el-checkbox >
                   <span v-else>{{scope.row.isAutoIncrement===1?'是':'否'}}</span>
           </template>
@@ -152,7 +152,7 @@
           </template>
         </el-table-column>
         <el-table-column label="是否自增">
-          <template slot-scope="scope">
+          <template slot-scope="scope"  v-if="scope.row.rule==6">
             <span >{{scope.row.isAutoIncrement===1?'是':'否'}}</span>
           </template>
         </el-table-column>