暂存

src/HManagement/archives_ad/index.vue

@@ -18,9 +18,8 @@
       </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname === 'status'">
-            <span :style="scope.data.column.data.status === '审核' ? 'color:#52C41A' : ''">{{
-                scope.data.column.data.status == '审核' ? '发布' : scope.data.column.data.status
-            }}</span>
+            <span :style="scope.data.column.data.status === '审核' ? 'color:#52C41A' : ''">
+              {{scope.data.column.data.status == '审核' ? '发布' : scope.data.column.data.status }}</span>
           </div>
           <p v-else-if="scope.data.column.columnname === 'title'">
             【{{ getType(scope.data.column.data.type) }}】{{ scope.data.column.data.title }}
@@ -149,7 +148,7 @@ export default {
       this.$store.dispatch('pageOnlyRead',false)
       window.sessionStorage.setItem('newMaterial', JSON.stringify(data))
       this.$store.dispatch('DrawerShowChange',true)
-      this.$router.push({path:'/upload_archives',query:{id:data.sat_sharematerialid}})
+      this.$router.push({path:'/upload_archives',query:{id:data.sat_sharematerialid,type:'1'}})
     },
     dataCalc (data) {
       window.sessionStorage.setItem('newMaterial', JSON.stringify(data))

src/HManagement/archives_sc/list/modules/delete.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="display:inline">
     <el-popconfirm title="确定删除当前通告吗？" @confirm="deleteRow()">
-      <el-button slot="reference" size="mini">删 除</el-button>
+      <el-button type="primary"  plain slot="reference" size="small">删 除</el-button>
     </el-popconfirm>
   </div>
 </template>

src/HManagement/archives_sc/list/modules/details.vue

@@ -1,6 +1,10 @@
 <template>
   <div>
-
+    <div class="container normal-panel normal-margin sticky" v-if="edit">
+      <el-button class="inline-16" v-if="edit"  :disabled="form.status == '发布'" type="primary" size="small"  @click="editBtn" >编 辑</el-button>
+      <release :data="form" @onSuccess="selectDetail"></release>
+      <on-del v-if="tool.checkAuth($route.name,'delete') && form.status != '发布'" :data="form" @onSuccess="$store.dispatch('DrawerShowChange',false),$router.push('/archives_scmag')"></on-del>
+    </div>
     <div style="overflow-x:hidden">
       <el-row :gutter="16">
         <el-col :span="12">
@@ -8,11 +12,11 @@
           <div class="container normal-panel normal-margin">
           <div class="normal-title container" style="padding-top:0;display:flex;justify-content:space-between">
             <p>课程详情</p>
-            <div>
+<!--            <div>
               <el-button size="mini" @click="editBtn" style="margin-right:10px" :disabled="form.status == '发布'">编 辑</el-button>
               <release :data="form" @onSuccess="selectDetail"></release>
               <on-del v-if="tool.checkAuth($route.name,'delete') && form.status != '发布'" :data="form" @onSuccess="$store.dispatch('DrawerShowChange',false),$router.push('/archives_scmag')"></on-del>
-            </div>
+            </div>-->
           </div>
             <el-row :gutter="20">
               <el-form :model="form" :disabled="edit" :rules="rules" ref="form" size="small" status-icon label-position="right" label-width="100px" class="demo-ruleForm">
@@ -142,7 +146,7 @@ export default {
   methods:{
     editBtn () {
       window.sessionStorage.setItem('newMaterial', JSON.stringify(this.detailData))
-      this.$router.push({path:'/archives_scedit',query:{id:this.$route.query.id}})
+      this.$router.push({path:'/archives_scedit',query:{id:this.$route.query.id,type:'1'}})
     },
     onSubmit () {
       this.form.sat_courseware_classid = this.form.sat_courseware_classid_2

src/HManagement/archives_sc/list/modules/edit.vue

@@ -7,10 +7,10 @@
           <div class="container normal-panel normal-margin">
             <div style="display:flex;justify-content: space-between;">
               <p class="normal-title normal-margin" style="line-height:32px">课程设置</p>
-              <div v-if="!store.state.pageOnlyRead">
+<!--              <div v-if="!store.state.pageOnlyRead">
                 <el-button type="warning" size="small" icon="el-icon-s-claim" @click="onSubmit((res)=>tool.showMessage(res))"
                   :loading="store.state.loading">保 存</el-button>
-              </div>
+              </div>-->
             </div>
             <el-row :gutter="20">
               <el-form :model="form" :rules="rules" ref="form" size="small" status-icon label-position="right"
@@ -84,6 +84,15 @@
             @onChecked="onChecked"></scopeOfauth>
         </el-col>
       </el-row>
+      <div class="fixed__btn__panel">
+        <el-button @click="onBack" v-if="$route.query.type === '1'" class="normal-btn-width" size="small">取 消</el-button>
+        <el-button size="small" v-if="$route.query.type !== '1'" @click="$store.dispatch('DrawerShowChange',false)" class="normal-btn-width">取 消</el-button>
+<!--        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>-->
+<!--        <el-button type="primary" size="small" icon="el-icon-s-claim" @click="onSubmit((res)=>tool.showMessage(res))"
+                   :loading="store.state.loading">确 定</el-button>-->
+        <el-button type="primary" size="small" class="normal-btn-width" @click="onSubmit((res)=>tool.showMessage(res))"
+                   :loading="store.state.loading">确 定</el-button>
+      </div>
     </div>
   </div>
 </template>
@@ -238,6 +247,10 @@ export default {
       })
       this.defaultData = res.data
     },
+    onBack(){
+      window.sessionStorage.setItem('newMaterial', JSON.stringify(this.detailData))
+      this.$router.push({path:'/archives_scdetails',query:{id:this.$route.query.id}})
+    }
   },
   created() {
     this.tool.checkAuth(this.$route.name, 'data_analysis') ? '' : this.$router.go(-1);

src/HManagement/archives_sc/list/modules/release.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="inline-16">
-    <el-button size="mini" @click="releaseNotice">{{data.status === '新建'?'发 布':'取消发布'}}</el-button>
+    <el-button size="small" type="primary" plain @click="releaseNotice">{{data.status === '新建'?'发 布':'取消发布'}}</el-button>
   </div>
 </template>
 

src/SDrpManagement/QuotedPrice/components/productTable.vue

@@ -73,16 +73,49 @@
                 prop="caliber"
                 label="口径"
                 width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.caliber || '--'}}</span></p>
+              </template>
             </el-table-column>
             <el-table-column
                 prop="pressure"
                 label="压力"
                 width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.pressure || '--'}}</span></p>
+              </template>
             </el-table-column>
             <el-table-column
                 prop="material"
                 label="材质"
                 width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.material || '--'}}</span></p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="device"
+                label="装置"
+                width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.device || '--'}}</span></p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="prodline"
+                label="产线"
+                width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.prodline || '--'}}</span></p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="specalnote"
+                label="特殊说明"
+                width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.specalnote || '--'}}</span></p>
+              </template>
             </el-table-column>
             <el-table-column
                 prop="brand"

src/SDrpManagement/QuotedPrice/components/productTableProject.vue

@@ -73,16 +73,49 @@
                 prop="caliber"
                 label="口径"
                 width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.caliber || '--'}}</span></p>
+              </template>
             </el-table-column>
             <el-table-column
                 prop="pressure"
                 label="压力"
                 width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.pressure || '--'}}</span></p>
+              </template>
             </el-table-column>
             <el-table-column
                 prop="material"
                 label="材质"
                 width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.material || '--'}}</span></p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="device"
+                label="装置"
+                width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.device || '--'}}</span></p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="prodline"
+                label="产线"
+                width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.prodline || '--'}}</span></p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="specalnote"
+                label="特殊说明"
+                width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.specalnote || '--'}}</span></p>
+              </template>
             </el-table-column>
             <el-table-column
                 prop="brand"

src/SManagement/archives_upload/index.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="upload">
     <!--头部操作-->
-    <Header>
+<!--    <Header>
       <save type="save" @click.native="save()"></save>
-    </Header>
+    </Header>-->
     <el-row>
       <el-col :span="14">
         <!--标题 分类-->
@@ -40,6 +40,10 @@
         />
       </el-col>
     </el-row>
+    <div class="fixed__btn__panel">
+      <el-button size="small" @click="$store.dispatch('DrawerShowChange',false)" class="normal-btn-width">取 消</el-button>
+      <el-button size="small" :type="$route.query.type === '1' ?'warning':'primary'" @click="save" class="normal-btn-width">{{$route.query.type === '1' ?'保 存' : '确 定'}}</el-button>
+    </div>
   </div>
 </template>