hw

src/views/BidSystem/TotalBoard/detail.vue

@@ -1,9 +1,9 @@
 <template>
     <div>
         <Toptitle title="板材统计表详情">
-            <Button type="primary" style="margin-right: 10px" @click="checkTotal">查看合计</Button>
+            <!-- <Button type="primary" style="margin-right: 10px" @click="checkTotal">查看合计</Button>
             <Button @click="AllSelect" style="margin-right: 10px" type="primary">{{state?'取消全选':'全选'}}</Button>
-            <Button type="primary" ghost  @click='exportData()' style="margin-right: 10px">导出</Button>
+            <Button type="primary" ghost  @click='exportData()' style="margin-right: 10px">导出</Button> -->
             <Button type="primary" @click="$router.go(-1)">返回</Button>
         </Toptitle>
         <Form :label-width='80' style="display:flex;flex-wrap:wrap;margin-top:15px">
@@ -120,9 +120,7 @@ export default {
                 //        const text = `${row.long?row.long:0}*${row.wide?row.wide:0}*${row.thick?row.thick:0}`
                 //        return h('span',{},text)
                 //    }},
-                {title:'原料尺寸',align:'center',minWidth:150,key:'storage_size'},
-                     {title:'计量单位',align:'center',minWidth:80,key:'unit'},
-                     {title:'精裁面积',align:'center',minWidth:150,key:'cut_area'},
+                {title:'原料尺寸',align:'center',minWidth:150,key:'measure'},
                        {title:'数量',align:'center',minWidth:80,key:'num'},
             ],
             tableData:[],
@@ -244,9 +242,9 @@ export default {
             }
         },
         initUnderData(row){
-  this.axios.post('/api/finance_quota_detail_material',{order_no:this.$route.query.order_no,
+  this.axios.post('/api/finance_quota_detail_material_algorithm',{order_no:this.$route.query.order_no,
 	url_number:this.url_number,...row}).then(res=>{
-                  this.tableData = res.data.data;
+                  this.tableData = res.data;
     })
         },
         show(item,index){

src/views/BidSystem/TotalBoard/list.vue

@@ -79,7 +79,7 @@ export default {
           this.initData(this.proxyData)
         },
         goPageDetail(row){
-            this.$router.push({path:'/cms/BidSystem/QuotaRequisitionDetail',query:{order_no:row.order_no}});
+            this.$router.push({path:'/cms/BidSystem/TotalBoard/detail',query:{order_no:row.order_no}});
         },
         initData(row){
             this.proxyData = row;

src/views/PayrollRequisition/detail.vue

@@ -123,6 +123,18 @@
         <Input clearable v-model="formData.remark" v-else/>
         </Col>
     </Row>
+     <br>
+    <Row class="row_item">
+        <Col span="24" class="item">
+        <label style='margin-left:0px;width:118px'>附件：</label>
+              <div class="total_img">
+              <div v-for="(_item,_index) in formData.url" :key="_index" class="img_item">
+              <img @click="looks(_item.url,_item.is_pic)" :src="_item.is_pic?$store.state.ip + _item.url:require('./../../assets/imgs/file.jpg')" alt="" class="img_content"/>
+              <div class="img_title"><a @click="exportData(`${$store.state.ip}${_item.url}`,_item.is_pic,_item.name)">{{_item.name}}</a></div>
+              </div>
+             </div>
+        </Col>
+    </Row>
     <br>
     <Row class="row_item" v-if="type==3">
          <Col span="6" class="item">
@@ -304,6 +316,7 @@ export default {
               ],
              type:'',
              formData:{
+               url:[],//附件
                 payment_no:'',//请款单号
                 section_id:"",//部门id
                 payment_id:'',//请款人
@@ -494,9 +507,6 @@ label{
     font-size: 16px;
     line-height: 250%;
 }
-.row_item{
-   
-}
 .detail_row_item{
   margin:5px 0
 }
@@ -577,4 +587,25 @@ span{
     }
    
 }
+.img_content{
+    width: 150px;
+    height: 150px;
+}
+  .delete-img {
+  position: absolute;
+  right: 0px;
+  top: 0px;
+  color: red;
+  cursor: pointer;
+}  
+.upd_file{
+    background: rgb(242, 242, 242);
+    width: 200px;
+    height: 160px;
+    cursor: pointer;
+    .ico{
+        width: 100%;
+       line-height: 300%;
+    }
+}
 </style>

src/views/PayrollRequisition/edit.vue

@@ -295,6 +295,7 @@
               <div v-for="(_item,_index) in tableUrl" :key="_index" class="img_item">
               <img @click="looks(_item.url,_item.is_pic)" :src="_item.is_pic?$store.state.ip + _item.url:require('./../../assets/imgs/file.jpg')" alt="" class="img_content"/>
               <Icon
+              v-show="tableState==2"
               size="20"
               @click="delItems(_index, tableUrl)"
               class="delete-img"

src/views/ProductionOrderList/ProductionPlanlist/BST_two.vue

@@ -128,6 +128,7 @@ import { mapState } from "vuex";
 export default {
   data() {
     return {
+      setTableColumns:[],
       url_number:[],
       tooltip_data:'',
       loading: true,
@@ -448,15 +449,7 @@ export default {
           minWidth: 200,
           render: (h, params) =>
             h("span", {}, this.func.replaceDate(params.row.predict_time, 1)),
-        },
-        {
-          title: "操作",
-          align: "center",
-          key: "set",
-          slot: "set",
-          fixed: "right",
-          width: "150",
-        },
+        }
       ],
       tableData: [],
       showModal:false,
@@ -512,7 +505,14 @@ export default {
     ...mapState(["persimissionData"]),
     computedTable() {
       // if (this.tableheaders.length < 1) {
-      return this.tableColums;
+      return [...this.tableColums,...this.setTableColumns, {
+          title: "操作",
+          align: "center",
+          key: "set",
+          slot: "set",
+          fixed: "right",
+          width: "150",
+        }]
       // }
       // return this.func.computedHeader(this.tableheaders, this.tableColums)
     },
@@ -721,6 +721,23 @@ export default {
         (res) => {
           this.firstEnter++;
           this.tableData = res.data.data;
+          let header = [];
+          if(res.data.header.length!=0){
+              res.data.header.forEach(v=>{
+                let obj = {};
+                obj.title = `${v.title}状态`;
+                obj.align = 'center';
+                obj.minWidth = 120;
+                obj.key = v.key;
+                obj.render = (h,params)=>{
+                  const {row} = params;
+                  return h('span',{},row[v.key]==0?'未派工':row[v.key]==1?'派工中':'已派工')
+                }
+                header.push(obj);
+          })
+          }
+        
+          this.setTableColumns = header;
           this.total = res.data.total;
           // this.tableheaders = res.data.tableSet || []
           let data =[];