gjy пре 2 година
родитељ
комит
dcd354d183

+ 57 - 1
src/views/contractManagement/purchaseContractExamine.vue

@@ -223,9 +223,31 @@
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
         <el-table-column prop="auditMind" label="审核意见"></el-table-column>
+        <el-table-column prop="auditMind" label="审核附件">
+          <template scope="scope">
+            <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
+          <span v-if="scope.row.auditImg != null">
+            {{
+                scope.row.auditImg.length == 0
+                  ? ''
+                  : scope.row.auditImg.length
+            }}
+          </span>
+          </template>
+        </el-table-column>
       </el-table>
     </ws-form>
-
+    <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose">
+      <div v-for="item in appendixIdss">
+        <el-image 
+        style="width: 100px; height: 100px"
+        :src="item" 
+        :preview-src-list="appendixIdss">
+      </el-image>
+      </div>
+    </WinseaContentModal>
     <div style="text-align: right; padding: 10px">
       <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">关闭</el-button>
     </div>
@@ -279,6 +301,8 @@
           contractProcessInfo: {},
           contractGoodsInfo: {},
         },
+        accessoryTFs:false,
+        appendixIdss:[],
         mainReportAdd: {},
         list: {},
         compId: localStorage.getItem('ws-pf_compId'),
@@ -291,12 +315,44 @@
       this.showType = this.isShow
     },
     methods: {
+      fujian(row) {
+      this.id = row.id
+      this.accessoryTFs = true
+      this.appendixIdss = row.auditImg
+      console.log(this.appendixIdss)
+    },
+    handleCloseq() {
+        this.accessoryTFs = false
+      },
       loaddata() {
         gettaskhistories({
             businessKey: this.$route.query.id,
             workflowId: this.$route.query.workflowId
           }).toPromise()
           .then((response) => {
+            if(response){
+              for (let i = 0; i < response.length; i++) {
+                if(response[i].auditMind){
+                  response[i].auditImg=[]
+                  var auditMind=response[i].auditMind.split('#')
+                  if(auditMind[2]!=''){
+                    var img=auditMind[2].split(',')
+                    for (let q = 0; q < img.length; q++) {
+                      if(img[q]!=''){
+                        response[i].auditImg.push(img[q])
+                      }
+                    }
+                  }
+                  if(auditMind[1]){
+                    response[i].auditMind=auditMind[1]
+                  }else{
+                    response[i].auditMind=''
+                  }
+                  console.log(auditMind[1],1111,auditMind[2])
+                }
+                
+              }
+            }
             this.taskhistories = response
           })
         // 数据

+ 2 - 2
src/views/warehousenew/warehouseManagementList.vue

@@ -750,7 +750,7 @@
               inside: false, // 是否朝内
               rotate: 0, // 旋转角度
               margin: 10, // 刻度标签与轴线之间的距离
-              color: '#D9DDE7', // 默认取轴线的颜色
+              color: '#929AB8', // 默认取轴线的颜色
               interval: 0,
             },
             splitArea: { // 网格区域
@@ -768,7 +768,7 @@
               inside: false, // 是否朝内
               rotate: 0, // 旋转角度
               margin: 8, // 刻度标签与轴线之间的距离
-              color: '#D9DDE7', // 默认轴线的颜色
+              color: '#929AB8', // 默认轴线的颜色
             },
             splitLine: { // gird 区域中的分割线
               show: true, // 是否显示