Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/inspectInfo.vue

@@ -233,7 +233,6 @@
         return String(year) + String(mouth) + String(datetime)
       },
       calculation() {
-        console.log(this.getdate())
         let number = '000' + this.count
         number = number.substring(number.length - 4, number.length)
         this.inspect.qualityNo = 'SGRK' + this.getdate() + this.cangNo + number //SGRK+8位时间+3位仓库编号+4位序列号
@@ -581,7 +580,6 @@
                     .toPromise()
                     .then((response) => {
                       this.inspect = response
-                      console.log(this.inspect,'cdsklh')
                     })
                   this.isShowPrint = true
                 })

src/views/houseSelfCollect/settlement.vue

@@ -727,6 +727,7 @@ export default {
       postpaymentedit(this.paymentList).toPromise().then((response) => {
          getpaymentexamine({id:this.$route.query.id}).toPromise().then((response) => {
              this.printData= response
+             console.log(this.printData,"结算打印")
          })
          this.isShowPrint = true
         },

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -132,14 +132,7 @@
         ></el-table-column>
         <el-table-column prop="taskStatus" label="状态">
           <template slot-scope="scope">
-            <el-popover
-              placement="left"
-              :width="285"
-              trigger="click"
-              visible-arrow="false"
-              @show="history(scope.row)"
-            >
-              <template>
+             <template>
                 <span slot="reference">
                   <span
                     v-if="scope.row.taskStatus == '待审核'"
@@ -156,27 +149,6 @@
                   {{ scope.row.taskStatus }}
                 </span>
               </template>
-              <div>
-                <p style="margin-top: 0; padding-left: 10px">操作历史</p>
-                <div v-for="(item, index) in historyList" class="flex">
-                  <div class="vertical-text vertical-text-left">
-                    {{ item.updateDate }}
-                  </div>
-                  <div>
-                    <div class="vertical-circle"></div>
-                    <div
-                      v-if="index != historyList.length - 1"
-                      class="vertical-line"
-                    ></div>
-                  </div>
-                  <div class="vertical-text">
-                    {{ item.operateUser }}
-                    <br />
-                    {{ item.dealMsg }}
-                  </div>
-                </div>
-              </div>
-            </el-popover>
             <img
               v-if="scope.row.taskStatus == '执行中'"
               width="17"

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -1618,6 +1618,9 @@ export default {
           return
         }
       }
+      // this.dataList.goodsNameKey =
+      // this.dataList.positionId = 
+      // this.dataList.baseId = 
       this.dataList.inOutFlag = 1
       this.dataList1.inOutFlag = 2
       if (this.dataList.taskTypeKey == 1) {

src/views/warehouse/warehouseManagementPut.vue

@@ -1050,6 +1050,8 @@ export default {
           return
         }
       }
+      console.log(this.deptBudgetList,"入库对象")
+      return
       this.deptBudgetList.id = this.$route.query.id
       this.$confirm(`确定提交入库信息`, {
         cancelButtonText: '取消',