增项提交审核按钮;资质文件样式

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -707,65 +707,42 @@
                          height="360px"
                          style="margin-top: 20px"></manufacturer-list>
     </el-card>
+    <el-card class="box-card mycard"
+             style="margin-top: 35px;">
+      <div slot="header"
+           class="clearfix">
+        <span style="padding:3px 20px">现场考察报告</span>
+        <el-button :disabled="parseInt(certId) === 0" type="primary" style="margin-left: 10px;" plain size="mini" title="上传" @click="openDialog()" >上传
+        </el-button>
+      </div>
+      <el-table :data="scenefileurllist" border size="mini" empty-text="暂无数据" style="margin-top: 30px;">
+        <el-table-column prop="FileUrlList" label="报告" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <viewer :images="scenefileurllist">
+              <el-col :span="6"  v-for="(tmpUrl,index) in scenefileurllist" v-if="index<1" :key="index" style="vertical-align: middle;	text-align: center;">
+                <el-link :href="'http://'+fileurlcut(scenefile.FileUrl, scope.$index)" target="_blank" type="primary"
+                         v-if="imgFormat(scenefile.FileUrl, index)" >
+                  {{scenefile.FileName.split('$')[scope.$index]}}</el-link>
+                <img
+                  v-else
+                  class="photoStyle" alt=""
+                  :src="'http://'+fileurlcut(scenefile.FileUrl, scope.$index)"
+                  :key="index">
+              </el-col>
+            </viewer>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="150" align="center" fixed>
+          <template slot-scope="scope">
+            <el-button type="primary" plain size="mini" title="删除" style="margin-left:3px"
+                       v-if="scenefile.FileName != ''" @click="deletedata(scenefile.FileName.split('$')[scope.$index], scenefile.FileUrl.split('$')[scope.$index])">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
     <!--打印内容结束-->
     <!--endprint1-->
     <!-- && (formData.InStyle != '2') -->
-    <el-card style="margin-top: 35px;">
-      <el-row>
-        <el-col :span="24">
-          <span>现场考察报告</span>
-          <el-button :disabled="parseInt(certId) === 0" type="primary" style="margin-left: 10px;" plain size="mini" title="上传" @click="openDialog()" >上传
-          </el-button>
-          <!--<el-upload multiple style="margin-top: 10px;" action="" ref="refuploadattach"-->
-          <!--:http-request="uploadrequest" class="attach-uploader" :before-upload="beforeAvatarUpload">-->
-          <!--<i class="el-icon-plus attach-uploader-icon"></i>-->
-          <!--&lt;!&ndash;<div slot="tip" class="el-upload__tip" v-if="SubfileForm.NeedFileType !=yasuoname">请上传图片（大小为512KB-5MB），可上传多张图片&ndash;&gt;-->
-          <!--&lt;!&ndash;</div>&ndash;&gt;-->
-          <!--&lt;!&ndash;<div slot="tip" class="el-upload__tip" v-if="SubfileForm.NeedFileType ==yasuoname">请上传压缩文件&ndash;&gt;-->
-          <!--&lt;!&ndash;</div>&ndash;&gt;-->
-          <!--</el-upload>-->
-        </el-col>
-      </el-row>
-<!--      <el-row style="margin-top: 10px;">-->
-        <el-table :data="scenefileurllist" border size="mini" empty-text="暂无数据" style="margin-top: 30px;">
-          <el-table-column prop="FileUrlList" label="报告" show-overflow-tooltip>
-            <template slot-scope="scope">
-              <viewer :images="scenefileurllist">
-                <el-col :span="6"  v-for="(tmpUrl,index) in scenefileurllist" v-if="index<1" :key="index" style="vertical-align: middle;	text-align: center;">
-                  <el-link :href="'http://'+fileurlcut(scenefile.FileUrl, scope.$index)" target="_blank" type="primary"
-                           v-if="imgFormat(scenefile.FileUrl, index)" >
-                    {{scenefile.FileName.split('$')[scope.$index]}}</el-link>
-                  <img
-                    v-else
-                    class="photoStyle" alt=""
-                    :src="'http://'+fileurlcut(scenefile.FileUrl, scope.$index)"
-                    :key="index">
-                </el-col>
-              </viewer>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" width="150" align="center" fixed>
-            <template slot-scope="scope">
-              <el-button type="primary" plain size="mini" title="删除" style="margin-left:3px"
-                         v-if="scenefile.FileName != ''" @click="deletedata(scenefile.FileName.split('$')[scope.$index], scenefile.FileUrl.split('$')[scope.$index])">删除</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-<!--        <viewer :images="scenefileurllist">-->
-<!--          <el-col :span="6"  v-for="(tmpUrl,index) in scenefileurllist" :key="index" style="vertical-align: middle;	text-align: center;">-->
-<!--            <el-link :href="'http://'+fileurlcut(scenefile.FileUrl, index)" target="_blank" type="primary"-->
-<!--                     v-if="imgFormat(scenefile.FileUrl, index)" >-->
-<!--              {{scenefile.FileName.split('$')[index]}}</el-link>-->
-<!--            <img-->
-<!--              v-else-->
-<!--              class="photoStyle" alt=""-->
-<!--              :src="'http://'+fileurlcut(scenefile.FileUrl, index)"-->
-<!--              :key="index">-->
-<!--          </el-col>-->
-<!--        </viewer>-->
-<!--      </el-row>-->
-    </el-card>
-
     <el-dialog title="现场考察报告" :visible.sync="visible" top="5vh" width="900px">
       <el-form :model="SubfileForm" label-width="100px">
         <el-row>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -508,14 +508,6 @@
                 </el-table-column>
                 <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
               </el-table>
-              <div style="float: right; margin: 20px;">
-                <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
-                           v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交
-                </el-button>
-                <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick"
-                           v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交
-                </el-button>
-              </div>
             </el-card>
             <el-row :gutter="2">
               <el-col :span="12">
@@ -570,6 +562,14 @@
                 </el-card>
               </el-col>
             </el-row>
+            <div style="float: right; margin: 20px;">
+              <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
+                         v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交审核
+              </el-button>
+              <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick"
+                         v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交
+              </el-button>
+            </div>
           </el-tab-pane>
         </el-tabs>
       </div>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -576,14 +576,6 @@
                 </el-table-column>
                 <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
               </el-table>
-              <div style="float: right; margin: 20px;">
-                <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
-                           v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交审核
-                </el-button>
-                <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick"
-                           v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交
-                </el-button>
-              </div>
             </el-card>
             <!-- 增项分类列表 -->
             <el-row :gutter="2">
@@ -668,6 +660,14 @@
                 </el-card>
               </el-col>
             </el-row>
+            <div style="float: right; margin: 20px;">
+              <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
+                         v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交审核
+              </el-button>
+              <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick"
+                         v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交
+              </el-button>
+            </div>
           </el-tab-pane>
         </el-tabs>
       </div>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -517,14 +517,6 @@
                 </el-table-column>
                 <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
               </el-table>
-              <div style="float: right; margin: 20px;">
-                <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
-                           v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交
-                </el-button>
-                <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick"
-                           v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交
-                </el-button>
-              </div>
             </el-card>
             <!-- 增项分类列表 -->
             <el-row :gutter="2">
@@ -561,6 +553,14 @@
                 </el-card>
               </el-col>
             </el-row>
+            <div style="float: right; margin: 20px;">
+              <el-button type="primary" size="mini" style="margin-right: 8px" @click="separateUnitSubmitClick"
+                         v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 0">提交审核
+              </el-button>
+              <el-button type="primary" size="mini" style="margin-right: 8px" @click="comSubmitToSeparateUnitClick"
+                         v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5 && IsCompanyUser == 1">提交
+              </el-button>
+            </div>
           </el-tab-pane>
         </el-tabs>
       </div>