hw

src/views/BidSystem/QuotaRequisitionDetail.vue

@@ -1,6 +1,7 @@
 <template>
     <div>
         <Toptitle title="定额领料单详情">
+            <Button type="primary" style="margin-right:10px" @click="handleWoolModal">设置板材原料尺寸</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>
@@ -88,12 +89,31 @@
             <Button type="primary" @click="modalBack" style="width:200px">返回</Button>
         </div>
         </Modal>
+        <Modal title="设置板材原料尺寸" v-model="show_wool" width='20' :closable='false' :mask-closable='false'>
+            <Form :label-width='100' >
+                <FormItem label='高：'>
+                    <Input v-model="woolModalData.high" style='width:60%' clearable/>
+                </FormItem>
+                <FormItem label='宽：' clearable v-model="woolModalData.wide">
+                    <Input v-model="woolModalData.wide" style='width:60%' clearable/>
+                </FormItem>
+            </Form>
+            <div slot="footer" style="text-align:center">
+                <Button style="margin-right:20px" @click="show_wool=false">取消</Button>
+                <Button type="primary" @click="sureWoolSize">确认</Button>
+            </div>
+        </Modal>
     </div>
 </template>
 <script>
 export default {
     data(){
         return{
+            woolModalData:{
+            high:'',
+            wide:''
+            },
+            show_wool:false,
             proxyData:{},
             total:0,
             pageSize:10,
@@ -161,6 +181,23 @@ export default {
             this.initData();
     },
     methods:{
+        sureWoolSize(){
+               this.show_wool = false;
+               let obj = JSON.stringify(this.woolModalData);
+               localStorage.setItem('wool_size',obj);
+        },
+        handleWoolModal(){
+            if(localStorage.getItem('wool_size')){
+                this.woolModalData=JSON.parse(localStorage.getItem('wool_size'));
+            }else{
+          this.woolModalData={
+              high:'',
+              wide:''
+          }
+            }
+            
+           this.show_wool = true;
+        },
         modalBack(){
               this.show_total = false;
               this.modalData.type_title = '';
@@ -181,7 +218,7 @@ export default {
             this.selectData.forEach(v=>{
                 url_number.push(v.url_number);
             })
-            this.axios.post('/api/finance_quota_detail_material_total',{url_number,order_no:this.$route.query.order_no,...data}).then(res=>{
+            this.axios.post('/api/finance_quota_detail_material_total',{url_number,order_no:this.$route.query.order_no,...data,...this.woolModalData}).then(res=>{
                 if(res.code == 200){
                     this.modalTableData = res.data.data;
                     this.total = res.data.total;
@@ -245,7 +282,7 @@ export default {
         },
         initUnderData(row){
   this.axios.post('/api/finance_quota_detail_material',{order_no:this.$route.query.order_no,
-	url_number:this.url_number,...row}).then(res=>{
+	url_number:this.url_number,...row,...this.woolModalData}).then(res=>{
                   this.tableData = res.data.data;
     })
         },

src/views/BidSystem/TotalBoard/detail.vue

@@ -1,9 +1,11 @@
 <template>
     <div>
         <Toptitle title="板材统计表详情">
-            <!-- <Button type="primary" style="margin-right: 10px" @click="checkTotal">查看合计</Button>
+             <Button type="primary" style="margin-right:10px" @click="handleWoolModal">设置板材原料尺寸</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">
@@ -88,12 +90,31 @@
             <Button type="primary" @click="modalBack" style="width:200px">返回</Button>
         </div>
         </Modal>
+         <Modal title="设置板材原料尺寸" v-model="show_wool" width='20' :closable='false' :mask-closable='false'>
+            <Form :label-width='100' >
+                <FormItem label='高：'>
+                    <Input v-model="woolModalData.high" style='width:60%' clearable/>
+                </FormItem>
+                <FormItem label='宽：' clearable v-model="woolModalData.wide">
+                    <Input v-model="woolModalData.wide" style='width:60%' clearable/>
+                </FormItem>
+            </Form>
+            <div slot="footer" style="text-align:center">
+                <Button style="margin-right:20px" @click="show_wool=false">取消</Button>
+                <Button type="primary" @click="sureWoolSize">确认</Button>
+            </div>
+        </Modal>
     </div>
 </template>
 <script>
 export default {
     data(){
         return{
+             woolModalData:{
+            high:'',
+            wide:''
+            },
+            show_wool:false,
             proxyData:{},
             total:0,
             pageSize:10,
@@ -159,6 +180,23 @@ export default {
             this.initData();
     },
     methods:{
+         sureWoolSize(){
+               this.show_wool = false;
+               let obj = JSON.stringify(this.woolModalData);
+               localStorage.setItem('wool_size_other',obj);
+        },
+        handleWoolModal(){
+            if(localStorage.getItem('wool_size_other')){
+                this.woolModalData=JSON.parse(localStorage.getItem('wool_size_other'));
+            }else{
+          this.woolModalData={
+              high:'',
+              wide:''
+          }
+            }
+            
+           this.show_wool = true;
+        },
         modalBack(){
               this.show_total = false;
               this.modalData.type_title = '';
@@ -179,7 +217,7 @@ export default {
             this.selectData.forEach(v=>{
                 url_number.push(v.url_number);
             })
-            this.axios.post('/api/finance_quota_detail_material_total',{url_number,order_no:this.$route.query.order_no,...data}).then(res=>{
+            this.axios.post('/api/finance_quota_detail_material_total',{url_number,order_no:this.$route.query.order_no,...data,...this.woolModalData}).then(res=>{
                 if(res.code == 200){
                     this.modalTableData = res.data.data;
                     this.total = res.data.total;
@@ -243,7 +281,7 @@ export default {
         },
         initUnderData(row){
   this.axios.post('/api/finance_quota_detail_material_algorithm',{order_no:this.$route.query.order_no,
-	url_number:this.url_number,...row}).then(res=>{
+	url_number:this.url_number,...row,...this.woolModalData}).then(res=>{
                   this.tableData = res.data;
     })
         },

src/views/PayrollRequisition/detail.vue

@@ -135,6 +135,21 @@
              </div>
         </Col>
     </Row>
+     <br>
+     <Row class="row_item">
+        <Col span="24" class="item">
+        <div>
+          <div style='display:flex'>
+        <label style="margin-left:0px;width:112px">付款记录：</label>
+        </div>
+         <Table :data='payTableData' :columns='payTableColumns' width='800' border style="margin-left:5.8vw">
+         <template slot="set" slot-scope="{row,index}">
+             <a style="margin-right:10px" @click="handleFile(row,1,index)">查看附件</a>
+         </template>
+         </Table>
+       </div>
+        </Col>
+    </Row>
     <br>
     <Row class="row_item" v-if="type==3">
          <Col span="6" class="item">
@@ -203,6 +218,20 @@
         </div>
       </div>
     </Modal>
+     <Modal v-model="show_tableFile" width='35' :mask-closable='false' :closable='false'>
+          <div slot="header" style="text-align:center">
+            查看附件
+          </div>
+           <div slot="footer" style="text-align:center">
+          <Button @click="show_tableFile=false" style="width:4vw">取消</Button>
+        </div>
+          <div class="total_img" style="max-height:400px;overflow:auto">
+              <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"/>
+              <div class="img_title"><a @click="exportData(`${$store.state.ip}${_item.url}`,_item.is_pic,_item.name)">{{_item.name}}</a></div>
+              </div>
+             </div>
+      </Modal>
     <Modal title="提交审批" v-model="show_submit">
           <Form :label-width='100'>
               <FormItem label="审批人：">
@@ -223,6 +252,19 @@
 export default {
     data(){
          return{ 
+           tableUrl:[],
+           show_tableFile:false,
+           payTableData:[],
+           payTableColumns:[
+             {title:'序号',type:'index',align:'center',minWidth:80},
+             {title:'付款时间',key:'pay_time',minWidth:120,align:'center',render:(h,params)=>{
+               const {row} = params;
+               return h('span',{},this.func.replaceDateNoHMS(row.pay_time))
+             }},
+             {title:'付款金额',key:'price',minWidth:120,align:'center'},
+             {title:'未付金额',key:'un_price',minWidth:120,align:'center'},
+             {title:'操作',key:'set',minWidth:200,align:'center',slot:'set'},
+           ],
              show_submit:false,
              check_id:'',
              state:'',
@@ -360,6 +402,17 @@ export default {
       
     },
     methods:{
+       handleFile(row,index){
+            //type 1 check 2edit
+            if(row.url.length==0){
+             return this.$Message.warning('无附件！')
+            }
+            this.tableState = type;
+            this.tableUrl = row.url;
+            this.tableIndex = index;
+            this.show_tableFile = true;
+            
+      },
         showSubmit(){
         if(this.state==0||this.state==2){
           this.show_submit = true;
@@ -425,6 +478,7 @@ initData(){
  this.formData.crt_time =Number(this.formData.crt_time)? this.func.replaceDate(this.formData.crt_time):'';
   this.formData.upd_time =Number(this.formData.upd_time)? this.func.replaceDate(this.formData.upd_time):'';
             // this.formData.invoice_type = [this.formData.invoice_type];
+            this.payTableData = res.data.payData||[];
             this.digitUppercase(this.formData.apply_price);
             delete this.formData.children;
      })

src/views/PayrollRequisition/edit.vue

@@ -334,7 +334,10 @@ export default {
            payTableData:[],
            payTableColumns:[
              {title:'序号',type:'index',align:'center',minWidth:80},
-             {title:'付款时间',key:'pay_time',minWidth:120,align:'center'},
+             {title:'付款时间',key:'pay_time',minWidth:120,align:'center',render:(h,params)=>{
+               const {row} = params;
+               return h('span',{},this.func.replaceDateNoHMS(row.pay_time))
+             }},
              {title:'付款金额',key:'price',minWidth:120,align:'center'},
              {title:'未付金额',key:'un_price',minWidth:120,align:'center'},
              {title:'操作',key:'set',minWidth:200,align:'center',slot:'set'},
@@ -671,6 +674,7 @@ initData(){
             this.formData.payment_time = this.func.replaceDateNoHMS(this.formData.payment_time);
  this.formData.crt_time =Number(this.formData.crt_time)? this.func.replaceDate(this.formData.crt_time):'';
   this.formData.upd_time =Number(this.formData.upd_time)? this.func.replaceDate(this.formData.upd_time):'';
+  this.payTableData = res.data.payData||[];
             this.digitUppercase(this.formData.apply_price);
             delete this.formData.children;
      })
@@ -679,6 +683,10 @@ initData(){
             let obj = JSON.parse(JSON.stringify(this.formData));
             obj.invoice_time = obj.invoice_time?Date.parse(obj.invoice_time).toString().slice(0,10):'';
              obj.payment_time = obj.payment_time?Date.parse(obj.payment_time).toString().slice(0,10):'';
+             let arr = JSON.parse(JSON.stringify(this.payTableData));
+             arr.forEach(v=>{
+               v.pay_time = v.pay_time?Date.parse(v.pay_time).toString().slice(0,10):'';
+             })
             if(this.type==1){   
            this.axios.post('/api/payment_add',{...obj}).then(res=>{
              if(res.code==200){
@@ -687,7 +695,7 @@ initData(){
              }
            })
             }else{
-                   this.axios.post('/api/payment_edit',{...obj}).then(res=>{
+                   this.axios.post('/api/payment_edit',{...obj,payData:arr}).then(res=>{
              if(res.code==200){
                  this.$Message.success(res.msg);
                  this.back();

src/views/ProductValue/list.vue

@@ -65,9 +65,9 @@ export default {
                 {title:'项目编号',align:'center',minWidth:120,key:'order_no'},
                 {title:'项目名称',align:'center',minWidth:120,key:'client_name'},
                 {title:'项目简称',align:'center',minWidth:120,key:'abbreviation'},
-                {title:'在线小计',align:'center',minWidth:120,key:'online_price'},
-                {title:'完成小计',align:'center',minWidth:120,key:'finish_price'},
-                {title:'备注',align:'center',minWidth:120,key:'remark'},
+                // {title:'在线小计',align:'center',minWidth:120,key:'online_price'},
+                // {title:'完成小计',align:'center',minWidth:120,key:'finish_price'},
+                // {title:'备注',align:'center',minWidth:120,key:'remark'},
                 {title:'操作',align:'center',minWidth:120,key:'set',slot:'set'}
             ],
                searchData:{

vue.config.js

@@ -2,7 +2,7 @@ const axios_default_ip =
   process.env.NODE_ENV == "dev"
     ? "http://121.41.102.225:82"
     : process.env.NODE_ENV == "test-prd"
-    ? "http://121.41.102.225:999" //
+    ? "http://121.37.173.82:82" //
     : process.env.NODE_ENV == "prd_other"
     ? "http://121.37.173.82:82" //贝斯特
     : "http://124.71.176.88:882";