项目管理撤销

src/api/purchaseIssue/index.js

@@ -128,13 +128,12 @@ export function revoke(data) {
 //大撤销
 export function revokeBill(data) {
   return request({
-    url: '/anpin/stockControl/withdrawById',
+    url: '/anpin/project/withdrawById',
     method: 'post',
     data:data
   })
 }
 //获取审批人
-
 export function getName(data) {
   return request({
     url: 'warehouse/paths/projectEndQueryPendingVal',

src/views/project/index1.vue

@@ -891,7 +891,6 @@ export default {
     },
     //物料带出单位
     change(scope){
-      console.log(this.materialOption)
       for(let item in this.detailList){
         for(let li in this.materialOption){
           if(this.detailList[item].fMaterial == this.materialOption[li].fId){
@@ -909,7 +908,6 @@ export default {
     },
     homePage(){
       let date = this.$route.query
-      console.log(this.$route.query.list)
       if (this.$route.query.list){
         this.cancelButton = false;
         let scope = {
@@ -992,7 +990,6 @@ export default {
     liableRemoteMethod(name) {
       let queryParams = { fName: name }
       getliable(queryParams).then((response) => {
-        console.log(response)
         this.liableOption = response.rows
       })
     },
@@ -1000,7 +997,6 @@ export default {
     materialRemoteMethod(name) {
       let queryParams = { fName: name }
       listmaterial(queryParams).then((response) => {
-        console.log(response)
         this.materialOption = response.rows
       })
     },
@@ -1010,9 +1006,6 @@ export default {
       listCharge(this.form).then(response => {
         if (response.rows) {
           this.projectList = response.rows
-          // for (let li in this.projectList) {
-          //   this.name = this.projectList[li]
-          // }
         }
         this.total = response.total;
       })
@@ -1026,7 +1019,6 @@ export default {
     handleUpdate(row, res) {
       const fId = row.fId || this.ids
       getChange(fId).then(response => {
-        console.log("111")
         if (response.data.projectItemsList) {
           this.detailform = response.data.tProject
           this.operator = this.detailform.createBy
@@ -1038,7 +1030,6 @@ export default {
             this.$set(this.detailList[li], 'fMeasure', JSON.stringify(this.detailList[li].fMeasure))
           }
         }
-        console.log(this.detailform.fBillstatus)
         if(this.detailform.fBillstatus >= 4){
           this.doNot = true
           this.doNotchange = true
@@ -1091,14 +1082,12 @@ export default {
       this.$refs['detailform'].validate((valid) => {
         if (valid) {
           let formData = new window.FormData()
-          console.log(this.detailform)
           formData.append('tProject', JSON.stringify(this.detailform))
           formData.append('tCtnpriceItems', JSON.stringify(this.detailList))
           addChange(formData).then(response => {
             this.$message.success("操作成功")
             if (response.data.tProject) {
               this.detailform = response.data.tProject
-              console.log(this.detailform)
             }
             if (response.data.tCtnpriceItems) {
               this.detailList = response.data.tCtnpriceItems
@@ -1109,7 +1098,6 @@ export default {
       })
     },
     goBack() {
-      console.log(this.$route.query)
       if (this.doNot == true && !this.$route.query.data) {
         this.mainTabel = false
       }else if(this.$route.query.data){

src/views/reportAnalysis/inoutStatistics.vue

@@ -0,0 +1,275 @@
+<template>
+  <div class="app-container">
+    <formComponent
+      :formOption="formOption"
+      :dataList="dataList"
+      :inDex="inDex"
+      ref="avatar"
+      @submitForm="submitForm"
+      @returnToForm="returnToForm"
+    />
+    <listComponent
+      :tableData="tableData"
+      @modify="modification"
+      @deletion="deletion"
+      @buttonList="buttonList"
+      @showSearch="showSearch"
+      @feedback="feedback"
+      @getList="getList"
+      :hasPermi="hasPermi"
+      :isItHidden="isItHidden"
+      :customButton="customButton"
+      :listStyle="listStyle"
+      :queryList="queryList"
+      :setRowList="setRowList"
+      :tatolLabel="tatolLabel"
+    />
+    <el-pagination
+      style="float: right;margin-top: 10px"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :page-sizes="[10, 20, 30, 50]"
+      :page-size="this.formDataList.pageSize"
+      background
+      layout="sizes, prev, pager, next"
+      :total="total">
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'salesStatistics',
+  data(){
+    return{
+      tatolLabel:['数量'],
+      dataList:{},
+      tableData:[],
+      setRowList:[],
+      isItHidden: true,
+      queryList: {
+        tableName: '出入库统计',
+        columnList: []
+      },
+      hasPermi:{
+        lookup:['anpin:stockControl:query'],
+        disappear:['anpin:stockControl:remove']
+      },
+      customButton: [
+        {
+          type: 'primary',
+          size: 'mini',
+          icon: 'el-icon-edit',
+          name: '导出',
+          disabled: false,
+          hasPermi:['anpin:stockControl:anPingApply']
+        }],
+      inDex: 4,
+      total:0,
+      formDataList:{
+        pageSize:10,
+        pageNum:1,
+      },
+      listStyle: [
+        {
+          surface: '1',
+          label: 'serialNumber',
+          name: '序号',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },{
+          surface: '2',
+          label: 'fBillno',
+          name: '进货时间',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },{
+          surface: '3',
+          label: 'fBillno',
+          name: '产品名称',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },
+        {
+          surface: '4',
+          label: 'fBillno',
+          name: '规格',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },
+        {
+          surface: '2',
+          label: 'fBillno',
+          name: '数量',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },
+        {
+          surface: '2',
+          label: 'fBillno',
+          name: '供货商',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },
+        {
+          surface: '2',
+          label: 'fBillno',
+          name: '供货人',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },
+        {
+          surface: '2',
+          label: 'fBillno',
+          name: '联系电话',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },
+        {
+          surface: '2',
+          label: 'fBillno',
+          name: '生产日期或批号',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },
+        {
+          surface: '2',
+          label: 'fBillno',
+          name: '保质期限',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },
+        {
+          surface: '2',
+          label: 'fBillno',
+          name: '保存条件',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },
+        {
+          surface: '2',
+          label: 'fBillno',
+          name: '索证索票',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },
+        {
+          surface: '2',
+          label: 'fBillno',
+          name: '采购人',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },
+        {
+          surface: '2',
+          label: 'fBillno',
+          name: '感官',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },
+        {
+          surface: '2',
+          label: 'fBillno',
+          name: '数量',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        },
+        {
+          surface: '2',
+          label: 'fBillno',
+          name: '验收人',
+          checked: 0,
+          width: 100,
+          onabort: ''
+        }
+        ],
+      formOption:[
+        {
+          span: 6,
+          label: 'fBillno',
+          name: '申请编号',
+          inputType: 2,
+          width: 200,
+          labelSize: '80',
+          rules: [{ required: false, message: ' ' }]
+        }
+      ]
+    }
+  },
+  created() {
+    this.queryList.columnList = this.listStyle
+  },
+  methods:{
+    //修改
+    modification(scope) {
+      console.log(scope)
+    },
+    //删除
+    deletion(scope){},
+    //所以按钮
+    buttonList(row){
+      console.log(row)
+    },
+    // 显示搜索条件、点击后会调用此方法
+    showSearch() {
+      console.log('到我了')
+      this.searchWhether = !this.searchWhether
+    },
+    //搜索、重置、展开
+    feedback(res) {
+      console.log(res)
+      if (res == '展开') {
+        if (this.inDex == 4) {
+          this.inDex = this.formOption.length
+        } else {
+          this.inDex = 4
+        }
+      } else if (res == '搜索') {
+        this.$refs.avatar.submitForm()
+      } else if (res == '重置') {
+        this.$refs.avatar.form = {}
+        this.$refs.avatar.submitForm()
+      }
+    },
+    //点击刷新会调用此方法
+    getList() {
+      console.log('到我了2')
+    },
+    submitForm() {
+      console.log(this.$refs.avatar.form)
+      this.formDataList = this.$refs.avatar.form
+    },
+    returnToForm(row) {
+      console.log(row, 111)
+    },
+    //分页
+    handleSizeChange(val) {
+      this.formDataList.pageSize = val
+      this.query(this.formDataList)
+    },
+    handleCurrentChange(val) {
+      this.formDataList.pageNum = val
+      this.query(this.formDataList)
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/warehouse/inStock/index.vue

@@ -381,7 +381,8 @@ export default {
           name: "操作",
           checked: 0,
           width: 200,
-          operation:1
+          operation:1,
+          fixed:'right'
         }
 
       ],

vue.config.js

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