bug--hw

src/views/PayrollRequisition/detail.vue

@@ -2,8 +2,8 @@
     <div>
            <Toptitle :title="type==1?'请购单新增':type==2?'请款单编辑':'请款单详情'">
                <Button type="primary" style="margin-right:20px" @click="showSubmit" v-if="type!=1">{{state==0||state==2?'提交审批':'审批'}}</Button>
-               <Button type="primary" @click="back" style="margin-right:20px">取消</Button>
-               <Button type="primary" style="margin-right:20px" @click="postData">保存</Button>
+               <Button type="primary" @click="back" style="margin-right:20px">返回</Button>
+               <!-- <Button type="primary" style="margin-right:20px" @click="postData">保存</Button> -->
            </Toptitle>
         <div style="height:90%;overflow:auto">
             <Row class="row_item" :style="{ty}">
@@ -84,7 +84,7 @@
      <br>
     <Row class="row_item">
         <Col span="24" class="item">
-        <label style="width:300px">客户往来情况（财务部填写）：</label>
+        <label style="width:300px">客户往来情况表（财务部填写）：</label>
         <span v-if="type==3||state==2||state==1" style="width:100%">{{formData.custom_news}}</span>
         <Input clearable v-model="formData.custom_news" v-else/>
         </Col>
@@ -186,7 +186,7 @@
         </div>
       </div>
     </Modal>
-    <Modal title="提交审批" v-model="show_submit" @on-ok='submit'>
+    <Modal title="提交审批" v-model="show_submit">
           <Form :label-width='100'>
               <FormItem label="审批人：">
                   <Select v-model="check_id">
@@ -194,6 +194,11 @@
                   </Select>
               </FormItem>
           </Form>
+           <div slot="footer">
+              <Button type="primary" ghost @click="show_submit=false">取消</Button>
+              <Button type="primary" @click="submit">确认</Button>
+              
+          </div>
       </Modal>
     </div>
 </template>
@@ -351,6 +356,9 @@ export default {
         }
       },
       submit(){
+          if(!this.check_id){
+                return this.$Message.warning('请选择审批人！')
+            }
         this.axios.post('/api/payment_check',{payment_no:[this.$route.query.payment_no],id:this.check_id,state:this.state}).then(res=>{
                               if(res.code==200){
                         this.$Message.success(res.msg);

src/views/PayrollRequisition/edit.vue

@@ -84,7 +84,7 @@
      <br>
     <Row class="row_item">
         <Col span="24" class="item">
-        <label style="width:250px">客户往来情况（财务部填写）：</label>
+        <label style="width:250px">客户往来情况表（财务部填写）：</label>
         <span v-if="type==3||state==2||state==1" style="width:100%">{{formData.custom_news}}</span>
         <Input clearable v-model="formData.custom_news" v-else/>
         </Col>
@@ -93,11 +93,11 @@
     <Row class="row_item">
         <Col span="18" class="item">
         <label style="margin-left:0px;width:110px">发票情况：</label>
-       <CheckboxGroup class="check_group" v-model="formData.invoice_type">
-        <Checkbox :label="1" class="check_item" :disabled='type==3'>专票</Checkbox>
-        <Checkbox :label="2" class="check_item" :disabled='type==3'>普票</Checkbox>
-        <Checkbox :label="3" class="check_item" :disabled='type==3'>无票</Checkbox>
-    </CheckboxGroup>
+       <RadioGroup class="check_group" v-model="formData.invoice_type">
+        <Radio :label="1" class="check_item" :value='1' :disabled='type==3'>专票</Radio>
+        <Radio :label="2" class="check_item" :value='2' :disabled='type==3'>普票</Radio>
+        <Radio :label="3" class="check_item" :value='3' :disabled='type==3'>无票</Radio>
+    </RadioGroup>
     <RadioGroup v-model="formData.invoice_state">
         <Radio :label="1" class="check_item" :value='1' :disabled='type==3'>已到</Radio>
         <Radio :label="2" class="check_item" :value='2' :disabled='type==3'>未到</Radio>
@@ -114,7 +114,7 @@
     <Row class="row_item">
         <Col span="24" class="item">
         <label style='margin-left:0px;width:118px'>备注：</label>
-         <span v-if="type==3">{{formData.remark}}</span>
+         <span v-if="type==3||state==2||state==1">{{formData.remark}}</span>
         <Input clearable v-model="formData.remark" v-else/>
         </Col>
     </Row>
@@ -305,7 +305,7 @@ export default {
                 information:'',//汇款信息
                 apply_price:'',//申请金额
                 price_detail:'',//费用明细
-                invoice_type:[],//发票种类
+                invoice_type:'',//发票种类
                 invoice_state:'',//发票状态
                 invoice_time:'',//回票时间
                 remark:''//备注
@@ -360,6 +360,10 @@ export default {
         )
       },
         digitUppercase(n) {
+          if(Number(n)<0){
+            this.formData.apply_price =0;
+            n=0;
+          }
     const fraction = ['角', '分'];
     const digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
     const unit = [['元', '万', '亿'], ['', '拾', '佰', '仟']];
@@ -392,14 +396,12 @@ 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.formData.invoice_type = [this.formData.invoice_type];
             this.digitUppercase(this.formData.apply_price);
             delete this.formData.children;
      })
 },
         postData(){
             let obj = JSON.parse(JSON.stringify(this.formData));
-            obj.invoice_type = obj.invoice_type.toString();
             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):'';
             if(this.type==1){   

src/views/PayrollRequisition/list.vue

@@ -14,47 +14,47 @@
        <div class="content">
        <Form class="form_content" :label-width='120'>
            <FormItem label='请款单号：'>
-               <Input class="form_item" placeholder="请搜素" v-model="searchData.payment_no"/>
+               <Input class="form_item" placeholder="请搜素" v-model="searchData.payment_no" clearable/>
            </FormItem>
            <FormItem label='申请部门：'>
-              <Select class="form_item" v-model="searchData.section_id">
+              <Select class="form_item" v-model="searchData.section_id" filterable clearable>
                    <Option v-for="item in sectionList" :key="item.id" :label="item.title" :value="item.id"/>
                </Select>
            </FormItem>
            <FormItem label='请款人：'>
-               <Select class="form_item" v-model="searchData.payment_id">
+               <Select class="form_item" v-model="searchData.payment_id" filterable clearable>
                    <Option v-for="item in users" :key='item.id' :value="item.id" :label="item.nickname"/>
                </Select>
            </FormItem>
            <FormItem label='供应商名称：'>
-               <Select class="form_item" v-model="searchData.supply_id">
+               <Select class="form_item" v-model="searchData.supply_id" filterable clearable>
                    <Option v-for="(item,index) in suppliersList" :key="index" :value="item.id" :label="item.title"></Option>
                </Select>
            </FormItem>
            <FormItem label='联系人：'>
-               <Select class="form_item" v-model="searchData.link">
+               <Select class="form_item" v-model="searchData.link" filterable clearable>
                    <Option v-for="item in users" :key='item.id' :value="item.id" :label="item.nickname"/>
                </Select>
            </FormItem>
            <FormItem label='制单人：'>
-                <Select class="form_item" v-model="searchData.crt_id">
+                <Select class="form_item" v-model="searchData.crt_id" filterable clearable>
                    <Option v-for="item in users" :key='item.id' :value="item.id" :label="item.nickname"/>
                </Select>
            </FormItem>
            <FormItem label='审批状态：'>
-                  <Select class="form_item" v-model="searchData.state">
+                  <Select class="form_item" v-model="searchData.state" clearable>
                       <Option :value="0" label="未提交审批"/>
                       <Option :value="1" label="已提交未审批"/>
                         <Option :value="2" label='已审批'/>
                   </Select>
            </FormItem>
             <FormItem label='待审人：' >
-                <Select class="form_item" v-model="searchData.pend_id">
+                <Select class="form_item" v-model="searchData.pend_id" clearable>
                    <Option v-for="item in users" :key='item.id' :value="item.id" :label="item.nickname"/>
                </Select>
            </FormItem>
             <FormItem label='审批人：' style="width:100%">
-                <Select class="form_item" v-model="searchData.check_id">
+                <Select class="form_item" v-model="searchData.check_id" filterable clearable>
                    <Option v-for="item in users" :key='item.id' :value="item.id" :label="item.nickname"/>
                </Select>
            </FormItem>
@@ -102,7 +102,7 @@
               show-sizer
               :page-size='page_size' />
       </div>
-      <Modal title="提交审批" v-model="show_submit" @on-ok='submit'>
+      <Modal title="提交审批" v-model="show_submit">
           <Form :label-width='100'>
               <FormItem label="审批人：">
                   <Select v-model="check_id">
@@ -110,6 +110,11 @@
                   </Select>
               </FormItem>
           </Form>
+           <div slot="footer">
+              <Button type="primary" ghost @click="show_submit=false">取消</Button>
+              <Button type="primary" @click="submit">确认</Button>
+              
+          </div>
       </Modal>
     </div>
 </template>
@@ -241,6 +246,10 @@ export default {
                     if(ar.length!=this.selectData.length){
                         return this.$Message.warning('数据中有不能审批的数据！')
                     }
+                       this.confirmDelete({
+        title:'确认？',
+        content: "确认审批？",
+        then: () => {
                     let payment_no = [];
                     this.selectData.forEach(v=>{
                         payment_no.push(v.payment_no);
@@ -251,11 +260,19 @@ export default {
                         this.initData(this.searchData);
                     }
                         })
+        }
+                       })
                     break;
                 case '3':
                      if(this.selectData.length==0){
                         return this.$Message.warning('请先选择数据！');
                     };
+                      let stateData = this.selectData.filter(v=>{
+                        return v.state == 1||v.state == 2;
+                    });
+                   if(stateData.length!=0){
+                       return this.$Message.warning('数据中有不能删除的数据，请重新选择！')
+                   }
                    let payment = [];
                    this.selectData.forEach(v=>{
                        payment.push(v.payment_no);
@@ -312,6 +329,9 @@ export default {
           this.initData(this.searchData);
         },
         submit(){
+                if(!this.check_id){
+                return this.$Message.warning('请选择审批人！')
+            }
                if(this.submit_state){
                    let payment_no = [];
                    this.selectData.forEach(v=>{
@@ -345,12 +365,18 @@ export default {
                        this.show_submit = true;
                   this.chooseData = row;
                   }else{
+                        this.confirmDelete({
+        title:'确认？',
+        content: "确认审批？",
+        then: () => {
                         this.axios.post('/api/payment_check',{payment_no:[row.payment_no],id:JSON.parse(localStorage.getItem('user_info')).id,state:row.state}).then(res=>{
                               if(res.code==200){
                         this.$Message.success(res.msg);
                         this.initData(this.searchData);
                     }
                         })
+        }
+                        })
                   }
                   break;
              case 2:
@@ -369,24 +395,24 @@ export default {
             });
         },
       });
-                 break
+                 break;
           }
         },
         initData(row){
             let obj = {};
             if(row){
                 obj = JSON.parse(JSON.stringify(row));
-                obj.crt_start_time = obj.start_time?Date.parse(obj.start_time).toString().slice(0,10):'';
-                obj.crt_end_time = obj.end_time?Date.parse(obj.end_time).toString().slice(0,10):'';
-                 obj.payment_start_time = obj.start_time?Date.parse(obj.start_time).toString().slice(0,10):'';
-                obj.payment_end_time = obj.end_time?Date.parse(obj.end_time).toString().slice(0,10):'';
-                 obj.invoice_start_time = obj.start_time?Date.parse(obj.start_time).toString().slice(0,10):'';
-                obj.invoice_end_time = obj.end_time?Date.parse(obj.end_time).toString().slice(0,10):'';
-                 obj.check_start_time = obj.start_time?Date.parse(obj.start_time).toString().slice(0,10):'';
-                obj.check_end_time = obj.end_time?Date.parse(obj.end_time).toString().slice(0,10):'';
+                obj.crt_start_time = obj.crt_start_time?Date.parse(obj.crt_start_time).toString().slice(0,10):'';
+                obj.crt_end_time = obj.crt_end_time?Date.parse(obj.crt_end_time).toString().slice(0,10):'';
+                 obj.payment_start_time = obj.payment_start_time?Date.parse(obj.payment_start_time).toString().slice(0,10):'';
+                obj.payment_end_time = obj.payment_end_time?Date.parse(obj.payment_end_time).toString().slice(0,10):'';
+                 obj.invoice_start_time = obj.invoice_start_time?Date.parse(obj.invoice_start_time).toString().slice(0,10):'';
+                obj.invoice_end_time = obj.invoice_end_time?Date.parse(obj.invoice_end_time).toString().slice(0,10):'';
+                 obj.check_start_time = obj.check_start_time?Date.parse(obj.check_start_time).toString().slice(0,10):'';
+                obj.check_end_time = obj.check_end_time?Date.parse(obj.check_end_time).toString().slice(0,10):'';
             }
             this.loading = true;
-          this.axios.post('/api/payment_list',{...obj}).then(res=>{
+          this.axios.post('/api/payment_list',{...obj,page_index:this.page_index,page_size:this.page_size}).then(res=>{
               this.tableData = res.data.data;
               this.total = res.data.total;
               this.loading = false;

src/views/SealApprove/list.vue

@@ -15,10 +15,10 @@
        <div class="content">
        <Form class="form_content" :label-width='120'>
            <FormItem label='单据编号：'>
-               <Input class="form_item" placeholder="请搜素" v-model="searchData.seal_no"/>
+               <Input class="form_item" placeholder="请搜素" v-model="searchData.seal_no" clearable/>
            </FormItem>
            <FormItem label='用印单位：'>
-               <Input class="form_item" placeholder="请搜索" v-model="searchData.order_no"/>
+               <Input class="form_item" placeholder="请搜索" v-model="searchData.project_title" clearable/>
            </FormItem>
            <FormItem label='用印人：'>
                <Select class="form_item" v-model="searchData.user_id">
@@ -83,7 +83,7 @@
               show-sizer
               :page-size='page_size' />
       </div>
-      <Modal title="提交审批" v-model="show_submit" @on-ok='submit'>
+      <Modal title="提交审批" v-model="show_submit">
           <Form :label-width='100'>
               <FormItem label="审批人：">
                   <Select v-model="check_id">
@@ -91,6 +91,11 @@
                   </Select>
               </FormItem>
           </Form>
+          <div slot="footer">
+              <Button type="primary" ghost @click="show_submit=false">取消</Button>
+              <Button type="primary" @click="submit">确认</Button>
+              
+          </div>
       </Modal>
     </div>
 </template>
@@ -102,7 +107,7 @@ export default {
             submit_state:false,
             searchData:{
                   seal_no:'',
-                  order_no:'',
+                  project_title:'',
                   user_id:'',
                   section_id:'',
                   pend_id:'',
@@ -197,6 +202,10 @@ export default {
                     if(ar.length!=this.selectData.length){
                         return this.$Message.warning('数据中有不能审批的数据！')
                     }
+                     this.confirmDelete({
+        title:'确认？',
+        content: "确认审批？",
+        then: () => {
                     let seal_no = [];
                     this.selectData.forEach(v=>{
                         seal_no.push(v.seal_no);
@@ -207,11 +216,19 @@ export default {
                         this.initData(this.searchData);
                     }
                         })
+        }
+                     })
                     break;
                 case '3':
                      if(this.selectData.length==0){
                         return this.$Message.warning('请先选择数据！');
                     };
+                    let stateData = this.selectData.filter(v=>{
+                        return v.state == 1||v.state == 2;
+                    });
+                   if(stateData.length!=0){
+                       return this.$Message.warning('数据中有不能删除的数据，请重新选择！')
+                   }
                    let seal = [];
                    this.selectData.forEach(v=>{
                        seal.push(v.seal_no);
@@ -268,6 +285,9 @@ export default {
           this.initData(this.searchData);
         },
         submit(){
+            if(!this.check_id){
+                return this.$Message.warning('请选择审批人！')
+            }
                if(this.submit_state){
                    let seal_no = [];
                    this.selectData.forEach(v=>{
@@ -301,12 +321,19 @@ export default {
                        this.show_submit = true;
                   this.chooseData = row;
                   }else{
+                      this.confirmDelete({
+        title:'确认？',
+        content: "确认审批？",
+        then: () => {
                         this.axios.post('/api/seal_check',{seal_no:[row.seal_no],id:JSON.parse(localStorage.getItem('user_info')).id,state:row.state}).then(res=>{
                               if(res.code==200){
                         this.$Message.success(res.msg);
                         this.initData(this.searchData);
                     }
-                        })
+                        
+            })
+        }
+                  })
                   }
                   break;
              case 2:

src/views/leadMatch/MatchList/matchList.vue

@@ -15,8 +15,8 @@ export default {
     },
     created(){
        
-       this.axios.post('/api/explode_order_type').then(res=>{
-               this.type = res.data.type;
+       this.axios.post('/api/get_cut_order_type').then(res=>{
+               this.type = res.data;
        })
     },
     components:{

src/views/leadMatch/roomList/list.vue

@@ -15,8 +15,8 @@ export default {
     },
      created(){
        
-       this.axios.post('/api/explode_order_type').then(res=>{
-               this.type = res.data.type;
+       this.axios.post('/api/get_cut_order_type').then(res=>{
+               this.type = res.data;
        })
     },
     components:{

src/views/leadMatch/weightMemo/list.vue

@@ -15,8 +15,8 @@ export default {
     },
       created(){
        
-       this.axios.post('/api/explode_order_type').then(res=>{
-               this.type = res.data.type;
+       this.axios.post('/api/get_cut_order_type').then(res=>{
+               this.type = res.data;
        })
     },
     components:{