Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

public/static/warehousePrint.html

@@ -241,7 +241,7 @@
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
   <script src="../cdn/element-ui/2.13.2/index.js"></script>
   <script type="text/javascript">
-    import  API_CONFIG from "../../vue.config.js"
+    // import  API_CONFIG from "../../vue.config.js"
     new Vue({
       el: '#app',
       data: {
@@ -299,7 +299,7 @@
         printBig() {}
       },
       mounted() {
-        console.log(API_CONFIG,1111111111)
+        // console.log(API_CONFIG,1111111111)
         // var ippath=API_CONFIG.devServer.proxy['/pb'].target
 
         this.company = localStorage.getItem("ws-pf_compName")

src/views/contractManagement/collectionContract.vue

@@ -119,7 +119,7 @@
             " alt="" />
           <div v-if="
               (scope.row.approveStatus != '待决策人审核' &&
-                !scope.row.approveStatus)
+                !scope.row.approveStatus || scope.row.approveStatus == '发起人撤回')
             " style="display: inline-block">
             <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px"
               src="../../../public/img/bianji.png" @click="handleEdit(scope.row)" v-hasPermission="
@@ -144,6 +144,10 @@
             v-hasPermission="
                 `contractManagement.dsContract.dsContractInfo.list`
               " @click="handleRecord(scope.row)" alt="" />
+              <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+                <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
+                  @click="withdraw(scope.row)" v-hasPermission="`contractManagement.dsContract.dsContractInfo.edit`" alt="" />
+              </div>
         </template>
       </el-table-column>
     </el-table>
@@ -166,7 +170,8 @@
     billoperatehis,
     deletecontract,
     editInfo,
-    getstafffind
+    getstafffind,
+    sponsorWithdraw
   } from '@/model/contarct/index'
   import {
     downloadFile
@@ -214,7 +219,7 @@
         searchType: 1,
         searchTypeText: '未完成',
         searchKeyWord: '',
-        contractType: 3,
+        contractType: 1,
         goodsType: 1,
         startDate: null,
         endDate: null,
@@ -301,7 +306,7 @@
         },
         value1: '',
         value2: '',
-        createPersion: "",//创建人
+        createPersion: '',//创建人
         persionList: [],
       }
     },
@@ -314,6 +319,22 @@
       this.persionXiaLa()
     },
     methods: {
+      withdraw(row) {
+      this.$confirm(`撤回成功后，可再次提交，确定撤回该合同吗？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        sponsorWithdraw({
+          workflowId: row.workflowId,
+          businessKey: row.id,
+        }).toPromise()
+          .then((response) => {
+            this.$message.success('撤回成功')
+            this.getList()
+          })
+      })
+    },
       persionXiaLa() {
       getstafffind({
         roles: 'b96299bb5dcf461e916b72b64c6943b0'
@@ -386,6 +407,7 @@
             goodsType: this.goodsType,
             currentPage: this.currentPage,
             pageSize: this.pageSize,
+            agreementType: '代收合同',
             searchType: this.searchType,
             searchKeyWord: this.searchKeyWord,
             startDate: this.startDate,

src/views/contractManagement/storageContract.vue

@@ -120,7 +120,7 @@
             " alt="" />
           <div v-if="
               (scope.row.approveStatus != '待决策人审核' &&
-                !scope.row.approveStatus)
+                !scope.row.approveStatus || scope.row.approveStatus == '发起人撤回')
             " style="display: inline-block">
             <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px"
               src="../../../public/img/bianji.png" @click="handleEdit(scope.row)" v-hasPermission="
@@ -145,6 +145,12 @@
             v-hasPermission="
                 `contractManagement.dcContract.dcContractInfo.list`
               " @click="handleRecord(scope.row)" alt="" />
+              <div v-if="scope.row.approveStatus && scope.row.approveStatus!='发起人撤回'" style="display: inline-block">
+              <img width="17" height="16" style="vertical-align: text-top; margin: 0 6px" src="../../../public/img/chehui.png"
+                @click="withdraw(scope.row)" v-hasPermission="
+                            `contractManagement.dcContract.dcContractInfo.edit`
+                          " alt="" />
+            </div>
         </template>
       </el-table-column>
     </el-table>
@@ -167,7 +173,8 @@
     billoperatehis,
     deletecontract,
     editInfo,
-    getstafffind
+    getstafffind,
+    sponsorWithdraw
   } from '@/model/contarct/index'
   import {
     downloadFile
@@ -285,7 +292,7 @@
           ],
         },
         value2: '',
-        createPersion: "",//创建人
+        createPersion: '',//创建人
       persionList: [],
       }
     },
@@ -298,6 +305,22 @@
       this.persionXiaLa()
     },
     methods: {
+      withdraw(row) {
+      this.$confirm(`撤回成功后，可再次提交，确定撤回该合同吗？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        sponsorWithdraw({
+          workflowId: row.workflowId,
+          businessKey: row.id,
+        }).toPromise()
+          .then((response) => {
+            this.$message.success('撤回成功')
+            this.getList()
+          })
+      })
+    },
       persionXiaLa() {
       getstafffind({
         roles: 'b96299bb5dcf461e916b72b64c6943b0'

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -315,7 +315,7 @@ export default {
       baseInfoForm: {
         warehouseId: '',
         warehouseName: '',
-        compId: '',
+        compId: this.$route.query.compId,
         goodsNameKey: '',
         goodsName: '',
         waterBase: '',
@@ -345,7 +345,6 @@ export default {
   },
 
   activated() {
-    debugger
 
     console.log(this.$route.query.type)
     // 货名
@@ -427,7 +426,7 @@ export default {
         this.baseInfoForm = {
           warehouseId: '',
           warehouseName: '',
-          compId: '',
+          compId: this.$route.query.compId,
           goodsNameKey: '',
           goodsName: '',
           waterBase: '',
@@ -522,7 +521,7 @@ export default {
         this.baseInfoForm.bulkDensityStandard = 1
       }else{
         this.isSolidFood = false
-        this.baseInfoForm.bulkDensityStandard = ""
+        this.baseInfoForm.bulkDensityStandard = ''
       }
     },
     onCloseGoodSelect() {
@@ -550,7 +549,7 @@ export default {
             this.baseInfoForm.bulkDensityStandard = 1
           }else{
             this.isSolidFood = false
-            this.baseInfoForm.bulkDensityStandard = ""
+            this.baseInfoForm.bulkDensityStandard = ''
           }
           // if (this.selectVal == '玉米淀粉' ||
           //   this.selectVal == '玉米（机收）' ||
@@ -596,7 +595,7 @@ export default {
           //防止填完数据  后切换货名不清空多余数据
           warehouseId: '',
           warehouseName: '',
-          compId: '',
+          compId: this.$route.query.compId,
           goodsNameKey: '',
           goodsName: '',
           waterBase: '',
@@ -627,7 +626,7 @@ export default {
         this.baseInfoForm.compId = this.$route.query.compId
         this.baseInfoForm.bulkDensityStandard = 1
       }else{
-        this.baseInfoForm.bulkDensityStandard = ""
+        this.baseInfoForm.bulkDensityStandard = ''
       }
       for (let num = 0; num < this.goodnameList.length; num++) {
         if (e == this.goodnameList[num].constValue) {
@@ -699,12 +698,12 @@ export default {
     // 增加分界
     add(item, item1, index) {
       let _data = this.detailList;
-      if (item.index > 2) {
-        this.$message({
-          message: '最多插入3个分界值',
-          type: 'warning',
-        })
-      } else {
+      // if (item.index > 2) {
+      //   this.$message({
+      //     message: '最多插入3个分界值',
+      //     type: 'warning',
+      //   })
+      // } else {
         item.index++
         item.detailList.splice(index + 1, 0, {
           name: '分界',
@@ -718,7 +717,7 @@ export default {
           type: 4,
         })
         this.makeSpliceIndex(item, item1, index)
-      }
+      // }
     },
     // 减少分界
     reduce(item, item1, index) {

src/views/statisticalReport/autoSettlementList.vue

@@ -870,7 +870,7 @@ export default {
         }
       }
     },
-    date() {
+    getDate() {
       var date = new Date();
       var y = date.getFullYear();
       var m = date.getMonth() + 1;
@@ -927,7 +927,7 @@ export default {
       // this.money = this.money
       this.tranSettlementReportList = this.warehouseList.records[0].tranSettlementReportList
       this.amountEdPayable = this.warehouseList.records[0].amountEdPayable
-      this.paymentDate = this.date()
+      this.paymentDate = this.getDate()
       if (this.modification.length == 0) {
         this.$message.warning('请选择一条要付款的条目')
       } else {