去掉输出日志

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -1,7 +1,6 @@
 // 查看出入库任务
 <template>
   <div class="container">
-           {{dataList}}
     <el-row>
       <el-col :span="12">
         <h2 class="bg-left title">查看出入库任务</h2>

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -409,7 +409,7 @@ export default {
         },
       })
     },
-    audit(item) {
+    audit(item) {debugger
       this.$router.push({
         path: 'tranManagementWarehouseInOuttaskaudit',
         query: {

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -6,45 +6,46 @@
         <h2 class="bg-left title">审核出入库任务</h2>
       </el-col>
       <el-col :span="12" class="bg-right">
-        <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="returnsales()"
-          ><img
+        <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">
+          <img
             width="6"
             height="10"
             style="vertical-align: bottom; margin-right: 3px"
             src="../../../public/img/lujing.png"
-            alt=""
-          />返回</el-button
-        >
+            alt
+          />返回
+        </el-button>
       </el-col>
     </el-row>
     <div class="basicInformation">
       <div class="annu">
-        <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
-        </el-radio-group>
+        <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey"></el-radio-group>
         <div class="nav">
           <span class="ziti">
             任务类型：
-            <h1 class="ziti1" v-show="dataList.inOutType == '移库入库'||dataList.inOutType == '移库出库'"> 移库任务</h1>
-          <h1 class="ziti1" v-show="dataList.inOutType == '销售出库'||dataList.inOutType == '暂存出库'||dataList.inOutType == '贸易服务出库'||dataList.inOutType == '采购出库'"> 出库任务</h1>
-          <h1 class="ziti1" v-show="dataList.inOutType == '采购入库'||dataList.inOutType == '暂存入库'||dataList.inOutType == '贸易服务入库'||dataList.inOutType == '退库'"> 入库任务</h1>
+            <h1
+              class="ziti1"
+              v-show="dataList.inOutType == '移库入库'||dataList.inOutType == '移库出库'"
+            >移库任务</h1>
+            <h1
+              class="ziti1"
+              v-show="dataList.inOutType == '销售出库'||dataList.inOutType == '暂存出库'||dataList.inOutType == '贸易服务出库'||dataList.inOutType == '采购出库'"
+            >出库任务</h1>
+            <h1
+              class="ziti1"
+              v-show="dataList.inOutType == '采购入库'||dataList.inOutType == '暂存入库'||dataList.inOutType == '贸易服务入库'||dataList.inOutType == '退库'"
+            >入库任务</h1>
           </span>
         </div>
       </div>
       <div class="ding"></div>
-      <div
-        v-if="dataList.taskTypeKey != 2 && dataList.taskTypeKey != 4"
-        class="center1"
-      >
+      <div v-if="dataList.taskTypeKey != 2 && dataList.taskTypeKey != 4" class="center1">
         <img
           style="position: relative; top: 40px; left: 300px"
           width="19"
           height="19"
           src="../../../public/img/cangku.png"
-          alt=""
+          alt
         />
         <!--出库=-->
         <div class="small-title">
@@ -143,11 +144,7 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item
-            label="重量（吨）"
-            span="1"
-            style="margin-left: 350px; margin-top: -40px"
-          >
+          <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
             <el-input
               disabled
               v-model="dataList.weight"
@@ -161,7 +158,7 @@
           <el-form-item label="品级">
             <el-select
               v-model="dataList.grade"
-              placeholder=""
+              placeholder
               class="typeselect"
               @change="selectpackingMethod"
             >
@@ -185,11 +182,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item
-            label="水分（%）<="
-            span="1"
-            style="margin-left: 350px; margin-top: -40px"
-          >
+          <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
             <el-input
               @input="waterContentchange"
               v-model="dataList.waterContent"
@@ -200,11 +193,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item
-            label="单价(元/吨)"
-            span="1"
-            style="margin-left: 650px; margin-top: -40px"
-          >
+          <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
             <el-input
               @input="unitPricechange"
               v-model="dataList.unitPrice"
@@ -215,12 +204,7 @@
             />
           </el-form-item>
           <!--预计出库日期-->
-          <el-form-item
-            label="预计出库日期"
-            span="1"
-            prop="predictDate"
-            class="deliverydate"
-          >
+          <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
             <el-date-picker
               disabled
               v-model="dataList.predictDate"
@@ -248,11 +232,7 @@
             </el-select>
           </el-form-item>
           <!--业务描述=-->
-          <el-form-item
-            v-if="dataList.taskTypeKey != 3"
-            label="业务描述"
-            span="1"
-          >
+          <el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="1">
             <el-input
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述，不超过150字"
@@ -278,7 +258,7 @@
           width="19"
           height="19"
           src="../../../public/img/cangku.png"
-          alt=""
+          alt
         />
         <div class="small-title">
           <h3>
@@ -286,12 +266,7 @@
             <span v-if="deletetask" style="color: red">已删除</span>
           </h3>
         </div>
-        <el-form
-          v-if="!deletetask"
-          ref="form"
-          :model="form"
-          label-width="140px"
-        >
+        <el-form v-if="!deletetask" ref="form" :model="form" label-width="140px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名" v-if="dataList1.inOutType == '移库入库'">
             <el-select
@@ -309,10 +284,7 @@
             </el-select>
           </el-form-item>
           <!-- 出库类型 -->
-          <el-form-item
-            label="入库类型"
-            v-if="dataList1.inOutType == '移库入库'"
-          >
+          <el-form-item label="入库类型" v-if="dataList1.inOutType == '移库入库'">
             <el-select
               disabled
               v-model="dataList1.inOutType"
@@ -385,11 +357,7 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item
-            label="重量（吨）"
-            span="1"
-            style="margin-left: 350px; margin-top: -40px"
-          >
+          <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
             <el-input
               @input="weightchange"
               v-model="dataList1.weight"
@@ -404,7 +372,7 @@
             <el-select
               :disabled="dataList.taskTypeKey == 3"
               v-model="dataList1.grade"
-              placeholder=""
+              placeholder
               class="typeselect"
               @change="selectpackingMethod1"
             >
@@ -429,11 +397,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item
-            label="水分（%）<="
-            span="1"
-            style="margin-left: 350px; margin-top: -40px"
-          >
+          <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
             <el-input
               @input="waterContentchange"
               :disabled="dataList.taskTypeKey == 3"
@@ -445,11 +409,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item
-            label="单价(元/吨)"
-            span="1"
-            style="margin-left: 650px; margin-top: -40px"
-          >
+          <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
             <el-input
               @input="unitPricechange"
               :disabled="dataList.taskTypeKey == 3"
@@ -461,12 +421,7 @@
             />
           </el-form-item>
           <!--预计出库日期-->
-          <el-form-item
-            label="预计入库日期"
-            span="1"
-            prop="predictDate"
-            class="deliverydate"
-          >
+          <el-form-item label="预计入库日期" span="1" prop="predictDate" class="deliverydate">
             <el-date-picker
               disabled
               v-model="dataList1.predictDate"
@@ -521,7 +476,7 @@
             width="19"
             height="19"
             src="../../../public/img/cangku.png"
-            alt=""
+            alt
           />
           <h3>出库任务({{ inOutTaskNo }})</h3>
         </div>
@@ -615,11 +570,7 @@
             </el-select>
           </el-form-item>
           <!--重量（吨）-->
-          <el-form-item
-            label="重量（吨）"
-            span="1"
-            style="margin-left: 350px; margin-top: -40px"
-          >
+          <el-form-item label="重量（吨）" span="1" style="margin-left: 350px; margin-top: -40px">
             <el-input
               disabled
               v-model="dataList.weight"
@@ -634,7 +585,7 @@
             <el-select
               disabled
               v-model="dataList.grade"
-              placeholder=""
+              placeholder
               class="typeselect"
               @change="selectpackingMethod"
             >
@@ -658,11 +609,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item
-            label="水分（%）<="
-            span="1"
-            style="margin-left: 350px; margin-top: -40px"
-          >
+          <el-form-item label="水分（%）<=" span="1" style="margin-left: 350px; margin-top: -40px">
             <el-input
               disabled
               v-model="dataList.waterContent"
@@ -673,11 +620,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item
-            label="单价(元/吨)"
-            span="1"
-            style="margin-left: 650px; margin-top: -40px"
-          >
+          <el-form-item label="单价(元/吨)" span="1" style="margin-left: 650px; margin-top: -40px">
             <el-input
               disabled
               v-model="dataList.unitPrice"
@@ -688,12 +631,7 @@
             />
           </el-form-item>
           <!--预计出库日期-->
-          <el-form-item
-            label="预计出库日期"
-            span="1"
-            prop="predictDate"
-            class="deliverydate"
-          >
+          <el-form-item label="预计出库日期" span="1" prop="predictDate" class="deliverydate">
             <el-date-picker
               v-model="dataList.predictDate"
               type="date"
@@ -727,49 +665,34 @@
               size="large"
             />
           </el-form-item>
-        </el-form>     
+        </el-form>
       </div>
     </div>
 
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="reject()"
-        >驳回</el-button
-      >
-      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
-        >通过</el-button
-      >
+      <el-button class="bg-bottom" type="primary" size="small" @click="reject()">驳回</el-button>
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit()">通过</el-button>
     </div>
-     <el-table
-        class="wenzi"
-        :data="taskhistories"
-        style="width: 80%"
-        height="180"
-      >
-        <el-table-column prop="operatorMajorRoleName" label="审核人">
-        </el-table-column>
-        <el-table-column prop="inOutTaskNo" label="审核结果">
-          <template scope="scope">
-            <span v-if='scope.row.approved'>通过</span>
-            <span v-if='!scope.row.approved'>驳回</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="createTime" label="审核时间"></el-table-column>
-        <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
-     </el-table>
-    <WinseaContentModal
-      v-model="outerVisible"
-      title="驳回原因"
-      @on-cancel="handleClose"
-    >
+    <el-table class="wenzi" :data="taskhistories" style="width: 80%" height="180">
+      <el-table-column prop="operatorMajorRoleName" label="审核人"></el-table-column>
+      <el-table-column prop="inOutTaskNo" label="审核结果">
+        <template scope="scope">
+          <span v-if="scope.row.approved">通过</span>
+          <span v-if="!scope.row.approved">驳回</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="审核时间"></el-table-column>
+      <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+    </el-table>
+    <WinseaContentModal v-model="outerVisible" title="驳回原因" @on-cancel="handleClose">
       <el-input
         type="textarea"
         :rows="2"
         maxlength="30"
         placeholder="请输入驳回原因，1~30个字"
         v-model="auditMind"
-      >
-      </el-input>
+      ></el-input>
       <div class="dialog-footer">
         <el-button @click="outerVisible = false">取 消</el-button>
         <el-button type="primary" @click="disableReasons">确定</el-button>
@@ -792,11 +715,12 @@ import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'
+import { mapGetters } from 'vuex'
 export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination,
+    Pagination
   },
   watch: {
     // vesselId(val) {
@@ -804,10 +728,10 @@ export default {
     // },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   computed: {
-    ...mapGetters(['deptBudgetList']),
+    ...mapGetters(['deptBudgetList'])
   },
   data() {
     return {
@@ -835,7 +759,7 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
-      taskhistories:[],
+      taskhistories: [],
       goodnameList: [],
       checked: true,
       form: {},
@@ -864,9 +788,9 @@ export default {
             required: true,
             type: 'number',
             message: '请输入活动名称',
-            trigger: 'blur',
-          },
-        ],
+            trigger: 'blur'
+          }
+        ]
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -874,7 +798,7 @@ export default {
       packtypeList: {},
       date: {
         year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
+        month: dayjs().format('MM')
       },
       contractList: [],
       inOutTaskNo: '',
@@ -883,11 +807,11 @@ export default {
       dataList1: { taskTypeKey: '1' },
       historyList: [],
       pickerBeginDateBefore: {
-        disabledDate: (time) => {
+        disabledDate: time => {
           return time.getTime() > Date.now()
-        },
+        }
       },
-      accessoryTFs: false,
+      accessoryTFs: false
     }
   },
   activated() {
@@ -913,7 +837,7 @@ export default {
       if (datetime < 10) {
         datetime = '0' + datetime
       }
-      return year +'' + mouth + datetime
+      return year + '' + mouth + datetime
     },
     reject() {
       this.outerVisible = true
@@ -926,22 +850,20 @@ export default {
         if (i > 90) continue
         arr.push(String.fromCharCode(i))
       }
-      arr.sort(function () {
+      arr.sort(function() {
         return Math.random() - 0.5
       })
       arr.length = 4
 
       return arr.join('')
     },
-    MathRand()
-{
-var Num='';
-for(var i=0;i<4;i++)
-{
-Num+=Math.floor(Math.random()*10);
-}
-return Num
-},
+    MathRand() {
+      var Num = ''
+      for (var i = 0; i < 4; i++) {
+        Num += Math.floor(Math.random() * 10)
+      }
+      return Num
+    },
     selectTaskNo(e) {
       if (this.dataList.taskTypeKey == 3) {
         this.dataList1.moveTaskNo = e
@@ -952,7 +874,7 @@ return Num
       this.deptBudgetList.staffList = val
       if (val) {
         //val存在
-        this.options = this.staffList.filter((item) => {
+        this.options = this.staffList.filter(item => {
           if (
             !!~item.staffName.indexOf(val) ||
             !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
@@ -997,10 +919,10 @@ return Num
           if (this.contractNoList[i].contractNo == e) {
             getGoodsName({
               contractId: this.contractNoList[i].id,
-              contractNo: this.contractNoList[i].contractNo,
+              contractNo: this.contractNoList[i].contractNo
             })
               .toPromise()
-              .then((response) => {
+              .then(response => {
                 this.$set(this.dataList, 'goodsName', response.goodsName)
                 this.$set(this.dataList, 'goodsNameKey', response.goodsNameKey)
                 this.$set(this.dataList, 'grade', response.grade)
@@ -1024,10 +946,10 @@ return Num
           if (this.contractNoList[i].contractNo == e) {
             getGoodsName({
               contractId: this.contractNoList[i].id,
-              contractNo: this.contractNoList[i].contractNo,
+              contractNo: this.contractNoList[i].contractNo
             })
               .toPromise()
-              .then((response) => {
+              .then(response => {
                 this.$set(this.dataList1, 'goodsName', response.goodsName)
                 this.$set(this.dataList1, 'goodsNameKey', response.goodsNameKey)
                 this.$set(this.dataList1, 'grade', response.grade)
@@ -1066,15 +988,15 @@ return Num
         sessionStorage.getItem('ws-pf_staffName')
       warehousetask(list)
         .toPromise()
-        .then((response) => {
+        .then(response => {
           woekflowhandle({
             taskId: list.taskId,
             approved: true,
             auditMind: '34',
-            needReapply: false,
+            needReapply: false
           })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.$message.success('审核成功')
               this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
             })
@@ -1087,15 +1009,15 @@ return Num
         sessionStorage.getItem('ws-pf_staffName')
       warehousetask(list)
         .toPromise()
-        .then((response) => {
+        .then(response => {
           woekflowhandle({
             taskId: list.taskId,
             approved: false,
             auditMind: this.auditMind,
-            needReapply: true,
+            needReapply: true
           })
             .toPromise()
-            .then((response) => {
+            .then(response => {
               this.$message.success('驳回成功')
               this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
             })
@@ -1125,7 +1047,7 @@ return Num
       if (!this.auditMind) {
         this.$message({
           message: '驳回原因不能为空！',
-          type: 'warning',
+          type: 'warning'
         })
         return
       }
@@ -1271,15 +1193,19 @@ return Num
       return Min + Math.round(Rand * Range)
     },
     getList() {
-      gettaskhistories({businessKey: this.$route.query.businessKey,workflowId: this.$route.query.workflowId}).toPromise()
-          .then((response) => {
-            this.taskhistories=response
-          })
+      gettaskhistories({
+        businessKey: this.$route.query.businessKey,
+        workflowId: this.$route.query.workflowId
+      })
+        .toPromise()
+        .then(response => {
+          this.taskhistories = response
+        })
 
       if (this.$route.query.relevanceId) {
         outexamine({ relevanceId: this.$route.query.relevanceId })
           .toPromise()
-          .then((response) => {
+          .then(response => {
             if (response.length > 1) {
               if (response[0].taskTypeKey == 3) {
                 if (response[0].inOutType == '移库出库') {
@@ -1299,7 +1225,7 @@ return Num
                     response[0].inOutTaskNo.indexOf('C') + 1,
                     response[0].inOutTaskNo.length
                   )
-              }else if (response[0].taskTypeKey == 2){
+              } else if (response[0].taskTypeKey == 2) {
                 this.dataList1 = response[0]
               }
               this.dataList = response[0]
@@ -1322,53 +1248,53 @@ return Num
       // 货名
       pullDown({ constId: 'CON2' })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.goodnameList = response
         })
       // 品级
       pullDown({ constId: 'CON3' })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.gradeList = response
         })
       pullDown({ constId: 'CON6' })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.storageType = response
         })
       pullDown({ constId: 'CON5' })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.storageType1 = response
         })
       xialaNo({
-        compId: this.compId,
+        compId: this.compId
       })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.contractNoList = response
         })
       //仓库名
       getwarehousename({
         compId: this.compId,
-        warehouseType: 1,
+        warehouseType: 1
       })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.warehouseNameList = response
         })
       getwarehousename({
         compId: this.compId,
-        warehouseType: 2,
+        warehouseType: 2
       })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.warehouseNameList1 = response
         })
       //经办人
       getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.options = response
           this.staffList = response
           //  this.agent = response
@@ -1398,7 +1324,7 @@ return Num
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
-        query: { id: row.id },
+        query: { id: row.id }
       })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
@@ -1409,11 +1335,11 @@ return Num
       console.log(row)
       billoperatehis({ id: row.id })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.historyList = response
         })
-    },
-  },
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -1610,7 +1536,7 @@ return Num
   width: 381px;
   height: 20px;
 }
-.wenzi{
-  margin:0 auto;
+.wenzi {
+  margin: 0 auto;
 }
 </style>