提交安品部分问题

src/combination/formComponent.vue

@@ -10,7 +10,7 @@
       >
         <el-input v-model="form[item.label]" :onkeyup="item.onabort" :disabled="item.disabled" v-if="item.inputType == 2" :style="{ width: item.width + 'px' }" size="small" :placeholder="'请输入'+item.name"></el-input>
         <span v-if="item.inputType == 1">
-          <el-select :multiple="item.multiple" clearable v-model="form[item.label]" :disabled="item.disabled" :style="{ width: item.width + 'px' }" filterable slot="prepend" @change="change(item.label,dataList[item.label],form[item.label])" placeholder="请选择">
+          <el-select :multiple="item.multiple" :clearable="item.clearable === true?false:true" v-model="form[item.label]" :disabled="item.disabled" :style="{ width: item.width + 'px' }" filterable slot="prepend" @change="change(item.label,dataList[item.label],form[item.label])" placeholder="请选择">
             <el-option v-for="(li,index) in dataList[item.label]" :key="index" :label="li.label" :value="li.value"></el-option>
           </el-select>
         </span>

src/views/purchaseIssue/index.vue

@@ -147,7 +147,7 @@
               <td class="column"></td>
               <td class="column">{{item.fFeeunitName}}</td>
               <td class="column">{{ item.fQty }}</td>
-              <td class="column">{{ item.fUnitprice?item.fUnitprice.toFixed(2):item.fUnitprice }}</td>
+              <td class="column">{{ item.fUnitprice?item.fUnitprice.toFixed(2):item.fUnitprice}}</td>
               <td class="column">{{ item.fAmount?item.fAmount.toFixed(2):item.fAmount }}</td>
               <td class="column">{{ item.remark }}</td>
             </tr>
@@ -340,8 +340,15 @@ export default {
           checked: 0,
           width: 100,
           onabort: ''
-        }, {
+        },{
           surface: '14',
+          label: 'fsbuName',
+          name: '开票公司',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }, {
+          surface: '15',
           label: 'operation',
           name: '操作',
           checked: 0,
@@ -605,7 +612,15 @@ export default {
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
-        }, {
+        },{
+          span: 6,
+          label: 'timeInterval',
+          name: '出库日期',
+          inputType: 3,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        },{
           span: 6,
           label: 'createBy',
           name: '申请人',
@@ -621,18 +636,19 @@ export default {
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
-        }, {
+        },{
           span: 6,
-          label: 'timeInterval',
-          name: '出库日期',
-          inputType: 3,
+          label: 'fFeeid',
+          name: '品名',
+          inputType: 1,
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
-        },{
+        },
+        {
           span: 6,
-          label: 'fFeeid',
-          name: '品名',
+          label: 'fSbu',
+          name: '开票公司',
           inputType: 1,
           width: 200,
           labelSize: '80',
@@ -1180,6 +1196,11 @@ export default {
     submitAnd(){
       this.$refs.avatar.form.fId = ''
       this.$refs.avatar.form.fBillno = ''
+      this.$refs.avatar.form.fCreateLog = ''
+      this.$refs.avatar.form.fBillstatus = 2
+      this.$refs.avatar.form.fPrintLog = ''
+      this.$refs.avatar.form.fBillstatus = 2
+      this.$refs.avatar.form.fPrint = 0
       this.contentList.forEach(item=>item.fId = '')
       this.contentOption.forEach(item => {
         if (item.label == 'personNaem' || item.label == 'corpsName' || item.label == 'createBy' || item.label == 'fBillno') {
@@ -1301,44 +1322,44 @@ export default {
     },
     //详情内容保存
     submitAndSave(item,res) {
-      if(this.$refs.avatar.form.fBillstatus < 4 || !this.$refs.avatar.form.fBillstatus) {
+      if(this.$refs.avatar.form.fBillstatus <= 4 || !this.$refs.avatar.form.fBillstatus) {
       let formData = new window.FormData()
       this.$refs.avatar.form.fMoney = 0
       this.contentList.forEach(item => this.$refs.avatar.form.fMoney += Number(item.fAmount))
-      this.dataList.fGoodsid.forEach(item => {
-        if (item.value == this.$refs.avatar.form.fGoodsid) {
-          this.$refs.avatar.form.fCorpid = item.fCorpid
-        }
-      })
       formData.append('tWarehousebills', JSON.stringify(this.$refs.avatar.form))
       formData.append('tWarehousebillsfees', JSON.stringify(this.contentList))
       formData.append('fBilltype', 'XS')
-      submit(formData).then(res => {
+      if (item === 3){
+        this.$refs.avatar.form.fId = ''
+        this.$refs.avatar.form.fBillno = ''
+        this.$refs.avatar.form.fCreateLog = ''
+        this.$refs.avatar.form.fReviewDate = ''
+        this.$refs.avatar.form.fPrintLog = ''
+        this.$refs.avatar.form.fBillstatus = 2
+        this.$refs.avatar.form.fPrint = 0
+        this.contentList.forEach(item=>item.fId = '')
+        this.contentOption.forEach(item => {
+          if (item.label == 'personNaem' || item.label == 'corpsName' || item.label == 'createBy' || item.label == 'fBillno') {
+            item.disabled = true
+          } else {
+            item.disabled = false
+          }
+        })
+        this.purchaseList.columnList.forEach(item => item.disabled = false)
+        this.contentButton.forEach(item => item.disabled = false)
+        this.contentStyle.forEach(item => item.disabled = false)
+      }else {
+        submit(formData).then(res => {
           if (res.code == 200) {
-            if(!res){
+            if(res){
               this.$refs.avatar.form = res.data.warehouseBills
             }
             this.contentList = res.data.tWarehousebillsCntrs
-            if (item === 3){
-              this.$refs.avatar.form.fId = ''
-              this.$refs.avatar.form.fBillno = ''
-              this.contentList.forEach(item=>item.fId = '')
-              this.contentOption.forEach(item => {
-                if (item.label == 'personNaem' || item.label == 'corpsName' || item.label == 'createBy' || item.label == 'fBillno') {
-                  item.disabled = true
-                } else {
-                  item.disabled = false
-                }
-              })
-              this.purchaseList.columnList.forEach(item => item.disabled = false)
-              this.contentButton.forEach(item => item.disabled = false)
-              this.contentStyle.forEach(item => item.disabled = false)
-            }else{
-              this.$message.success('保存成功')
-            }
+            this.$message.success('保存成功')
           }
         })
       }
+    }
       if (item == 1){
         this.dialogVisible = true
       }else if (item === 2){
@@ -1350,24 +1371,42 @@ export default {
         this.query(this.formDataList)
       }
       if (item === 3 && this.$refs.avatar.form.fBillstatus > 3){
-        let datae = {
-          fId:this.$refs.avatar.form.fId,
-          fBilltype:'XS'
-        }
-        copyNew(datae).then(res=> {
-          this.$message({
-            message: '复制新单成功',
-            type: 'success',
-            showClose: true
-          });
-          let scope = {
-            row: {
-              fId: res.data
-            }
+        this.$refs.avatar.form.fId = ''
+        this.$refs.avatar.form.fBillno = ''
+        this.$refs.avatar.form.fCreateLog = ''
+        this.$refs.avatar.form.fReviewDate = ''
+        this.$refs.avatar.form.fPrintLog = ''
+        this.$refs.avatar.form.fBillstatus = 2
+        this.$refs.avatar.form.fPrint = 0
+        this.contentList.forEach(item=>item.fId = '')
+        this.contentOption.forEach(item => {
+          if (item.label == 'personNaem' || item.label == 'corpsName' || item.label == 'createBy' || item.label == 'fBillno') {
+            item.disabled = true
+          } else {
+            item.disabled = false
           }
-          this.query(this.formDataList)
-          this.viewMethod(scope,res)
         })
+        this.purchaseList.columnList.forEach(item => item.disabled = false)
+        this.contentButton.forEach(item => item.disabled = false)
+        this.contentStyle.forEach(item => item.disabled = false)
+        // let datae = {
+        //   fId:this.$refs.avatar.form.fId,
+        //   fBilltype:'SQ'
+        // }
+        // copyNew(datae).then(res=> {
+        //   this.$message({
+        //     message: '复制新单成功',
+        //     type: 'success',
+        //     showClose: true
+        //   });
+        //   let scope = {
+        //     row: {
+        //       fId: res.data
+        //     }
+        //   }
+        //   this.query(this.formDataList)
+        //   this.viewMethod(scope,res)
+        // })
       }
     },
     //表单选中后触发

src/views/purchaseRequest/index.vue

@@ -144,10 +144,10 @@
           </tr>
           <tr v-for="(item,index) in contentList" :key="index">
             <td class="column">{{item.feeName}}</td>
-            <td class="column">{{item.fUnitprice?item.fUnitprice.toFixed(2):item.fUnitprice}}</td>
+            <td class="column">{{item.fUnitprice?Number(item.fUnitprice).toFixed(2):item.fUnitprice}}??????</td>
             <td class="column">{{item.fPurchase}}({{item.fFeeunitName}})</td>
             <td class="column">{{item.fQty}}({{item.fFeeunitName}})</td>
-            <td class="column">{{item.fAmount?item.fAmount.toFixed(2):item.fAmount}}</td>
+            <td class="column">{{item.fAmount?Number(item.fAmount).toFixed(2):item.fAmount}}??????</td>
             <td class="column">{{item.remark}}</td>
           </tr>
         </table>
@@ -339,7 +339,6 @@ export default {
           name: '生成日志',
           checked: 0,
           width: 160,
-          fixed:'right',
           operation: '1',
           onabort: ''
         },
@@ -625,7 +624,15 @@ export default {
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
-        }, {
+        },{
+          span: 6,
+          label: 'timeInterval',
+          name: '提货日期',
+          inputType: 3,
+          width: 300,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        },{
           span: 6,
           label: 'createBy',
           name: '申请人',
@@ -641,14 +648,6 @@ export default {
           width: 200,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
-        }, {
-          span: 6,
-          label: 'timeInterval',
-          name: '提货日期',
-          inputType: 3,
-          width: 300,
-          labelSize: '80',
-          rules: [{ required: false, message: ' ' }]
         },{
           span: 6,
           label: 'fFeeid',
@@ -1165,6 +1164,11 @@ export default {
     submitAnd(){
       this.$refs.avatar.form.fId = ''
       this.$refs.avatar.form.fBillno = ''
+      this.$refs.avatar.form.fCreateLog = ''
+      this.$refs.avatar.form.fPrintLog = ''
+      this.$refs.avatar.form.fReviewDate = ''
+      this.$refs.avatar.form.fBillstatus = 2
+      this.$refs.avatar.form.fPrint = 0
       this.contentList.forEach(item=>item.fId = '')
       this.contentOption.forEach(item => {
         if (item.label == 'personNaem' || item.label == 'corpsName' || item.label == 'createBy' || item.label == 'fBillno') {
@@ -1223,39 +1227,43 @@ export default {
     },
     //详情内容保存
     submitAndSave(item,res) {
-      console.log(res)
-      if(this.$refs.avatar.form.fBillstatus < 4 || !this.$refs.avatar.form.fBillstatus) {
+      console.log(item,res)
+      if(this.$refs.avatar.form.fBillstatus <= 4 || !this.$refs.avatar.form.fBillstatus) {
         let formData = new window.FormData()
         this.$refs.avatar.form.fMoney = 0
         this.contentList.forEach(item => this.$refs.avatar.form.fMoney += Number(item.fAmount))
         formData.append('tWarehousebills', JSON.stringify(this.$refs.avatar.form))
         formData.append('tWarehousebillsfees', JSON.stringify(this.contentList))
         formData.append('fBilltype', 'SQ')
-        submit(formData).then(res => {
-          if (res.code == 200) {
-            if(!res){
-              this.$refs.avatar.form = res.data.warehouseBills
+        if (item === 3){
+          this.$refs.avatar.form.fId = ''
+          this.$refs.avatar.form.fBillno = ''
+          this.$refs.avatar.form.fCreateLog = ''
+          this.$refs.avatar.form.fPrintLog = ''
+          this.$refs.avatar.form.fBillstatus = 2
+          this.$refs.avatar.form.fPrint = 0
+          this.contentList.forEach(item=>item.fId = '')
+          this.contentOption.forEach(item => {
+            if (item.label == 'personNaem' || item.label == 'corpsName' || item.label == 'createBy' || item.label == 'fBillno') {
+              item.disabled = true
+            } else {
+              item.disabled = false
             }
-            this.contentList = res.data.tWarehousebillsCntrs
-            if (item === 3){
-              this.$refs.avatar.form.fId = ''
-              this.$refs.avatar.form.fBillno = ''
-              this.contentList.forEach(item=>item.fId = '')
-              this.contentOption.forEach(item => {
-                if (item.label == 'personNaem' || item.label == 'corpsName' || item.label == 'createBy' || item.label == 'fBillno') {
-                  item.disabled = true
-                } else {
-                  item.disabled = false
-                }
-              })
-              this.purchaseList.columnList.forEach(item => item.disabled = false)
-              this.contentButton.forEach(item => item.disabled = false)
-              this.contentStyle.forEach(item => item.disabled = false)
-            }else{
+          })
+          this.purchaseList.columnList.forEach(item => item.disabled = false)
+          this.contentButton.forEach(item => item.disabled = false)
+          this.contentStyle.forEach(item => item.disabled = false)
+        }else {
+          submit(formData).then(res => {
+            if (res.code == 200) {
+              if(res){
+                this.$refs.avatar.form = res.data.warehouseBills
+              }
+              this.contentList = res.data.tWarehousebillsCntrs
               this.$message.success('保存成功')
             }
-          }
-        })
+          })
+        }
       }
       if (item == 1){
         this.dialogVisible = true
@@ -1268,24 +1276,43 @@ export default {
         this.query(this.formDataList)
       }
       if (item === 3 && this.$refs.avatar.form.fBillstatus > 3){
-        let datae = {
-          fId:this.$refs.avatar.form.fId,
-          fBilltype:'SQ'
-        }
-        copyNew(datae).then(res=> {
-          this.$message({
-            message: '复制新单成功',
-            type: 'success',
-            showClose: true
-          });
-          let scope = {
-            row: {
-              fId: res.data
-            }
+        this.$refs.avatar.form.fId = ''
+        this.$refs.avatar.form.fBillno = ''
+        this.$refs.avatar.form.fCreateLog = ''
+        this.$refs.avatar.form.fReviewDate = ''
+        this.$refs.avatar.form.fReviewDate = ''
+        this.$refs.avatar.form.fPrintLog = ''
+        this.$refs.avatar.form.fBillstatus = 2
+        this.$refs.avatar.form.fPrint = 0
+        this.contentList.forEach(item=>item.fId = '')
+        this.contentOption.forEach(item => {
+          if (item.label == 'personNaem' || item.label == 'corpsName' || item.label == 'createBy' || item.label == 'fBillno') {
+            item.disabled = true
+          } else {
+            item.disabled = false
           }
-          this.query(this.formDataList)
-          this.viewMethod(scope,res)
         })
+        this.purchaseList.columnList.forEach(item => item.disabled = false)
+        this.contentButton.forEach(item => item.disabled = false)
+        this.contentStyle.forEach(item => item.disabled = false)
+        // let datae = {
+        //   fId:this.$refs.avatar.form.fId,
+        //   fBilltype:'SQ'
+        // }
+        // copyNew(datae).then(res=> {
+        //   this.$message({
+        //     message: '复制新单成功',
+        //     type: 'success',
+        //     showClose: true
+        //   });
+        //   let scope = {
+        //     row: {
+        //       fId: res.data
+        //     }
+        //   }
+        //   this.query(this.formDataList)
+        //   this.viewMethod(scope,res)
+        // })
       }
     },
     //表单选中后触发

src/views/reportAnalysis/salesStatistics.vue

@@ -53,6 +53,7 @@
 import { queryItem, productName,queryData,listExport } from '@/api/reportAnalysis/salesStatistics'
 import Cookies from 'js-cookie'
 import { select } from '@/api/system/set'
+import { company } from '@/api/purchaseRequest'
 
 export default {
   name: 'salesStatistics',
@@ -61,6 +62,7 @@ export default {
       tatolLabel:['数量','金额'],
       dataList:{
         fGoodsid:[],
+        fSbu: [],
         fFeeTypeList:[],
         fFeeid:[],
         groupDate:[{label:'是',value:0},{label: '否',value: 1}],
@@ -117,48 +119,55 @@ export default {
           onabort: ''
         },{
           surface: '4',
+          label: 'fsbuName',
+          name: '开票公司',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },{
+          surface: '5',
           label: 'ffeetypeName',
           name: '物资类别',
           checked: 0,
           width: 100,
           onabort: ''
         },{
-          surface: '5',
+          surface: '6',
           label: 'fname',
           name: '物资',
           checked: 0,
           width: 100,
           onabort: ''
         },{
-          surface: '6',
+          surface: '7',
           label: 'fcurrency',
           name: '规格',
           checked: 0,
           width: 100,
           onabort: ''
         },{
-          surface: '7',
+          surface: '8',
           label: 'fqty',
           name: '数量',
           checked: 0,
           width: 100,
           onabort: ''
         },{
-          surface: '8',
+          surface: '9',
           label: 'ffeeunitidName',
           name: '计量单位',
           checked: 0,
           width: 100,
           onabort: ''
         },{
-          surface: '9',
+          surface: '10',
           label: 'price',
           name: '单价',
           checked: 0,
           width: 100,
           onabort: ''
         },{
-          surface: '10',
+          surface: '11',
           label: 'famount',
           name: '金额',
           checked: 0,
@@ -184,10 +193,11 @@ export default {
           labelSize: '80',
           multiple:true,
           rules: [{ required: false, message: ' ' }]
-        },{
+        },
+        {
           span: 6,
-          label: 'fFeeid',
-          name: '物资名称',
+          label: 'fSbu',
+          name: '开票公司',
           inputType: 1,
           width: 200,
           labelSize: '80',
@@ -195,11 +205,19 @@ export default {
         },{
           span: 6,
           label: 'cLoadDate',
-          name: '期间',
+          name: '出库日期',
           inputType: 3,
           width: 240,
           labelSize: '80',
           rules: [{ required: false, message: ' ' }]
+        },{
+          span: 6,
+          label: 'fFeeid',
+          name: '物资名称',
+          inputType: 1,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
         },
         {
           span: 6,
@@ -215,6 +233,7 @@ export default {
           label: 'groupDate',
           name: '是否按照日期分组',
           inputType: 1,
+          clearable:true,
           width: 200,
           labelSize: '140',
           rules: [{ required: false, message: ' ' }]
@@ -257,6 +276,16 @@ export default {
       tableName: this.queryList.tableName,
       userId: Cookies.get('userName')
     }
+    company().then(res => {
+      console.log(res)
+      this.dataList.fSbu = []
+      for (let item in res.data) {
+        this.dataList.fSbu.push({
+          label: res.data[item].fName,
+          value: res.data[item].fId
+        })
+      }
+    })
     this.getRow(data,'S')
 
   },
@@ -280,6 +309,7 @@ export default {
           this.$set(this.$refs.avatar.form,'groupDate',1)
         }
         this.$refs.avatar.form = this.formDataList
+        this.$set(this.$refs.avatar.form,'groupDate',0)
       })
     },
     //修改

src/views/warehouse/outStock/index.vue

@@ -885,7 +885,9 @@ export default {
     };
     this.getRow(data)
     let list = {
-      fBilltype:'CK'
+      fBilltype:'CK',
+      pageNum: 1,
+      pageSize: 10,
     }
     this.query(list)
     this.getList()
@@ -1207,9 +1209,13 @@ export default {
           }
           if(iem === undefined){
             this.detailButton.forEach(item => item.disabled = false)
-            this.detailForm.fBillstatus = 2
-            this.detailForm.fBillno = ''
             this.detailForm.fId = ''
+            this.detailForm.fBillno = ''
+            this.detailForm.fCreateLog = ''
+            this.detailForm.fPrintLog = ''
+            this.detailForm.fReviewDate = ''
+            this.detailForm.fBillstatus = 2
+            this.detailForm.fPrint = 0
             this.detailList.columnList.forEach(item => item.fId='')
             this.detailButton = this.$options.data().detailButton
           }else if(iem == 1){
@@ -1576,6 +1582,11 @@ export default {
           //     this.viewMethod(null,1,2)
           this.detailForm.fId = ''
           this.detailForm.fBillno = ''
+          this.detailForm.fCreateLog = ''
+          this.detailForm.fPrintLog = ''
+          this.detailForm.fReviewDate = ''
+          this.detailForm.fBillstatus = 2
+          this.detailForm.fPrint = 0
           this.detailList.columnList.forEach(item => item.fId='')
           //   }
           // })
@@ -1782,7 +1793,11 @@ export default {
           if(this.detailForm.fId){
             this.detailForm.fId = ''
             this.detailForm.fBillno = ''
+            this.detailForm.fCreateLog = ''
+            this.detailForm.fPrintLog = ''
+            this.detailForm.fReviewDate = ''
             this.detailForm.fBillstatus = 2
+            this.detailForm.fPrint = 0
             this.detailList.columnList.forEach(item => item.fId='')
             this.detailList.columnList.forEach(item => item.disabled=false)
             this.detailButton = this.$options.data().detailButton

vue.config.js

@@ -35,6 +35,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         target: `http://192.168.1.143:9020`,
+        
         // target: `http://localhost:8080`,
         // target: `https://ap.tubaosoft.com/prod-api/`,
         changeOrigin: true,