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

src/views/contractManagement/purchaseContractAdd.vue

@@ -240,6 +240,7 @@
           prop="unitContractPrice"
         >
           <ws-input
+            @input="pricechange"
             v-model="deptBudgetList.unitContractPrice"
             placeholder="请输入合同单价"
             maxlength="100"
@@ -609,6 +610,7 @@ export default {
       deptBudgetList: {
         deliverType: '1',
         finalTradingVolume: 0,
+        totalContractPrice:0,
         contractGoodsInfo: {
           goodsName: '',
         },
@@ -692,6 +694,9 @@ export default {
     weightchange(e) {
       this.deptBudgetList.finalTradingVolume = e
     },
+    pricechange(e) {
+      this.deptBudgetList.totalContractPrice = e*this.deptBudgetList.weight
+    },
     returnsales() {
       this.$router.push({ path: 'buyContract' })
     },
@@ -1334,6 +1339,7 @@ export default {
               this.deptBudgetList = {
                 deliverType: '1',
                 finalTradingVolume: 0,
+                totalContractPrice:0,
                 contractGoodsInfo: {
                   goodsName: '',
                 },

src/views/contractManagement/purchaseContractEdit.vue

@@ -506,7 +506,7 @@ import {
   delxiala,
   examineList,
   editInfo,
-  getstaff,
+  getstafffind
 } from '@/model/contarct/index'
 import WsUpload from '@/components/WsUpload'
 import { EventBus, dayjs } from 'base-core-lib'
@@ -569,7 +569,7 @@ export default {
   },
 
   activated() {
-    getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+    getstafffind({ roles: 'd6a5c8a52da544309259f91f75de1ec6' })
       .toPromise()
       .then((response) => {
         this.options = response

src/views/contractManagement/salesContractAdd.vue

@@ -258,6 +258,7 @@
             prop="unitContractPrice"
           >
             <ws-input
+              @input="pricechange"
               v-model="deptBudgetList.unitContractPrice"
               placeholder="请输入合同单价"
               maxlength="100"
@@ -621,6 +622,7 @@ export default {
       deptBudgetList: {
         deliverType: '1',
         finalTradingVolume: 0,
+        totalContractPrice:0,
         contractGoodsInfo: {
           goodsName: '',
         },
@@ -1319,6 +1321,7 @@ export default {
               this.deptBudgetList = {
                 deliverType: '1',
                 finalTradingVolume: 0,
+                totalContractPrice:0,
                 contractGoodsInfo: {
                   goodsName: '',
                 },
@@ -1425,6 +1428,9 @@ export default {
     weightchange(e) {
       this.deptBudgetList.finalTradingVolume = e
     },
+    pricechange(e) {
+      this.deptBudgetList.totalContractPrice = e*this.deptBudgetList.weight
+    },
     // 编辑
     editClick(item, index) {
       const map = JSON.parse(JSON.stringify(item))

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -157,8 +157,6 @@
           <el-button class="submit" @click="print">打印</el-button>
         </div>
       </div>
-
-
     </el-main>
   </el-container>
 </template>
@@ -901,7 +899,6 @@
               break;
           }
        }
-
       },
       //审核
       audit(item, status, status2) {

src/views/statisticalReport/salesClosingCashierList.vue

@@ -465,7 +465,7 @@ export default {
         posthandle({
           taskId: item.taskId,
           approved: status,
-          auditMind: reason != undefined ? '已驳回' : '34',
+          auditMind: reason != undefined ? '已驳回' : '无',
           needReapply: status2 != undefined ? true : false,
         })
           .toPromise()

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -610,7 +610,7 @@ export default {
         posthandle({
           taskId: item.taskId,
           approved: status,
-          auditMind: reason != undefined ? '已驳回' : '34',
+          auditMind: reason != undefined ? '已驳回' : '无',
           needReapply: status2 != undefined ? true : false,
         })
           .toPromise()

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -816,7 +816,7 @@ export default {
         posthandle({
           taskId: item.taskId,
           approved: status,
-          auditMind: reason != undefined ? '已驳回' : '34',
+          auditMind: reason != undefined ? '已驳回' : '无',
           needReapply: status2 != undefined ? true : false,
         })
           .toPromise()

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -367,6 +367,9 @@
         height="180"
       >
         <el-table-column prop="operatorMajorRoleName" label="审核人">
+          <template scope="scope">
+            {{scope.row.operatorMajorRoleName}}{{scope.row.operatorName}}
+            </template>
         </el-table-column>
         <el-table-column prop="inOutTaskNo" label="审核结果">
           <template scope="scope">

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -507,6 +507,8 @@ export default {
           this.searchType = this.taskTypeList[i].type
         }
       }
+      this.currentPage=1,
+      this.getList()
     },
     handleExamine(row) {
       this.$router.push({

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -1008,6 +1008,8 @@ export default {
           var that = this
           this.$message.success('添加成功')
           setTimeout(function() {
+            that.dataList={taskTypeKey:1}
+            that.dataList1={}
             that.$router.push({ path: 'tranManagementWarehouseInOuttask' })
           }, 2000)
         })

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -983,16 +983,16 @@ export default {
     },
     requestadd(list, status) {
       list.compId = sessionStorage.getItem('ws-pf_compId')
-      list.publisher =
-        sessionStorage.getItem('ws-pf_roleName') +
-        sessionStorage.getItem('ws-pf_staffName')
+      // list.publisher =
+      //   sessionStorage.getItem('ws-pf_roleName') +
+      //   sessionStorage.getItem('ws-pf_staffName')
       warehousetask(list)
         .toPromise()
         .then(response => {
           woekflowhandle({
             taskId: list.taskId,
             approved: true,
-            auditMind: '34',
+            auditMind: '无',
             needReapply: false
           })
             .toPromise()
@@ -1004,9 +1004,9 @@ export default {
     },
     requestaudit(list, status) {
       list.compId = sessionStorage.getItem('ws-pf_compId')
-      list.publisher =
-        sessionStorage.getItem('ws-pf_roleName') +
-        sessionStorage.getItem('ws-pf_staffName')
+      // list.publisher =
+      //   sessionStorage.getItem('ws-pf_roleName') +
+      //   sessionStorage.getItem('ws-pf_staffName')
       warehousetask(list)
         .toPromise()
         .then(response => {

src/views/warehouse/costmanagement.vue

@@ -87,7 +87,7 @@
       layout="total, sizes, prev, pager, next, jumper"
       :total="deptBudgetTotal"
     ></el-pagination>
-      <el-dialog title="修改加权成本价格" :visible.sync="editvisible">
+      <el-dialog :close-on-click-modal='false' title="修改加权成本价格" :visible.sync="editvisible">
         <el-form >
           <el-form-item label="价格（元/吨）" >
             <el-input placeholder="输入加权成本价格" v-model="price" autocomplete="off"></el-input>
@@ -191,7 +191,7 @@ export default {
       this.selectWarehouse()
     },
     warehouselocation(){
-      this.$router.push({ path: 'warehouselocation'})
+      this.$router.push({ path: 'warehouselocation',query:{cangId:this.cangid}})
     },
      weightedsubsidiary(){
        console.log(this.cangid)

src/views/warehouse/warehouseManagementDelivery.vue

@@ -24,7 +24,7 @@
     <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
       <div class="basicInformation">
         <h2>
-          {{ deptBudgetList.warehouseName }}库
+          {{ deptBudgetList.warehouseName }}
           <span
             class="position"
             v-show="this.deptBudgetList.warehouseType == 1"
@@ -232,8 +232,8 @@
             accept=".jpg, .jpeg, .png, .gif"
             ><el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
-          <div>
-            <img v-if='deptBudgetList.addressUrl' style='width:100px;height:100px;' :src="deptBudgetList.addressUrl" alt="">
+          <div v-if='deptBudgetList.addressUrl!=""'>
+            <img style='width:100px;height:100px;' :src="deptBudgetList.addressUrl" alt="">
           </div>
       <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
@@ -406,6 +406,7 @@ export default {
       contractList: [],
       deptBudgetList: {
         type:'干粮',
+        addressUrl:'',
         warehouseInOutDetail: {},
       },
       historyList: [],
@@ -763,6 +764,7 @@ export default {
           return
         }
       }
+      console.log(this.deptBudgetList,"出库！！！！！")
       this.$confirm(`暂存后可在待完成页面查看，确定暂存`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
@@ -1235,9 +1237,9 @@ export default {
       }
     },
     selectstorageType(e) {
-      for (var i = 0; i < this.storageType.length; i++) {
-        if (this.storageType[i].constValue == e) {
-          this.deptBudgetList.inOutTypeKey = this.storageType[i].constKey
+      for (var i = 0; i < this.deliveryType.length; i++) {
+        if (this.deliveryType[i].constValue == e) {
+          this.deptBudgetList.inOutTypeKey = this.deliveryType[i].constKey
         }
       }
     },

src/views/warehouse/warehouseManagementEdit.vue

@@ -83,6 +83,7 @@
             v-model="deptBudgetList.otherPersonPhone"
             placeholder="请选择其他负责人"
             @change="selectstaffOther"
+            :filter-method="dataFilter1"
             filterable 
             multiple
           >
@@ -236,13 +237,15 @@
 </template>
 <script>
 import { getFileList, saveFiles } from '@/model/upload'
+import {
+  getstafffind,
+} from '@/model/contarct/index'
 import {
   xiala,
   billoperatehis,
   getLook,
   edit,
-  delPosition,
-  getstaff,
+  delPosition
 } from '@/model/warehouse/index'
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import { downloadFile } from '@/utils/batchDown'
@@ -313,6 +316,7 @@ export default {
         },
       },
       options: [],
+      staffList1:[],
       optionsOther: [],
       value: '',
       accessoryTFs: false,
@@ -321,11 +325,12 @@ export default {
   },
   activated() {
     this.loaddata()
-    getstaff({ compId: sessionStorage.getItem('ws-pf_compId'),warehouseId:'' })
+    getstafffind({ roles: 'd6a5c8a52da544309259f91f75de1ec6' })
       .toPromise()
       .then((response) => {
         this.options = response
         this.optionsOther = response
+        this.staffList1 = response
         this.staffList = response
       })
     this.showType = this.isShow
@@ -378,6 +383,23 @@ export default {
         this.options = this.staffList
       }
     },
+    dataFilter1(val) {
+      this.deptBudgetList.personCharge = val
+      if (val) {
+        //val存在
+        this.optionsOther = this.staffList1.filter((item) => {
+          if (
+            !!~item.staffName.indexOf(val) ||
+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        //val为空时，还原数组
+        this.optionsOther = this.staffList1
+      }
+    },
     selectstaff(e) {
       for (var i = 0; i < this.staffList.length; i++) {
         if (this.staffList[i].staffName == e) {

src/views/warehouse/warehouseManagementIoss.vue

@@ -290,7 +290,7 @@ export default {
         })
         return
       }
-      if (this.deptBudgetList.physicalInventory <= 0) {
+      if (this.deptBudgetList.physicalInventory < 0) {
         this.$message({
           message: '实际库存输入错误！',
           type: 'warning',

src/views/warehouse/warehouseManagementIossRecord.vue

@@ -30,7 +30,7 @@
           src="../../../public/img/cangku.png"
           alt=""
         />
-        <span style="color: #323233">{{ deptBudgetList.warehouseName }}库</span>
+        <span style="color: #323233">{{ deptBudgetList.warehouseName }}</span>
         <span class="ware">{{ binNumber }}仓位</span>
       </h2>
       <el-table

src/views/warehouse/warehouseManagementList.vue

@@ -24,7 +24,7 @@
            `warehouseManagement.warehouse.warehouseInfo.edit`
           " @click="handleEdit()">编辑</ws-button>
         <ws-button v-hasPermission="
-           `warehouseManagement.warehouse.warehouseInfo.deiete`
+           `warehouseManagement.warehouse.warehouseInfo.delete`
           " @click="handleDelete()">删除</ws-button>
         <ws-button v-hasPermission="
            `warehouseManagement.warehouse.warehouseInfo.view`

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -30,7 +30,7 @@
             src="../../../public/img/cangku.png"
             alt=""
           />
-          {{ this.$route.query.warehouseName }}库
+          {{ this.$route.query.warehouseName }}
           <span class="position" v-show="this.$route.query.warehouseType == 1">
             {{ this.$route.query.binNumber }}仓位
           </span>

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -226,8 +226,8 @@
             accept=".jpg, .jpeg, .png, .gif"
             ><el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
-          <div>
-            <img v-if='dataList.addressUrl' style='width:100px;height:100px;' :src="dataList.addressUrl" alt="">
+          <div v-if='dataList.addressUrl!=""'>
+            <img style='width:100px;height:100px;' :src="dataList.addressUrl" alt="">
           </div>
       <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
@@ -421,6 +421,7 @@ export default {
         cost:'',
         freight:0,
         type:'',
+        addressUrl:'',
         buckleWeightRatio:'',
         tidalGrainWater:'',
         solidGrainWater:'',
@@ -959,9 +960,9 @@ export default {
       }
     },
     selectstorageType(e) {
-      for (var i = 0; i < this.storageType.length; i++) {
-        if (this.storageType[i].constValue == e) {
-          this.dataList.inOutTypeKey = this.storageType[i].constKey
+      for (var i = 0; i < this.deliveryType.length; i++) {
+        if (this.deliveryType[i].constValue == e) {
+          this.dataList.inOutTypeKey = this.deliveryType[i].constKey
         }
       }
     },

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -685,12 +685,14 @@ export default {
         confirmButtonText: '确定',
         type: 'warning',
       })
-        .then(() => {
+        .then(() => {debugger
           this.$refs.dataList.validate((valid) => {
             if (valid) {
               this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
               this.dataList.inOutFlag = 2
               this.dataList.statusFlag = 1
+              let _data = JSON.parse(sessionStorage.getItem('winseaview-userInfo'))
+              this.dataList.backOffice  = _data.content.showCompName+'-' +_data.content.staffName
               addstorageputList(this.dataList)
                 .toPromise()
                 .then((response) => {

src/views/warehouse/warehouseManagementPut.vue

@@ -33,7 +33,7 @@
             src="../../../public/img/cangku.png"
             alt
           />
-          {{ deptBudgetList.warehouseName }}库
+          {{ deptBudgetList.warehouseName }}
           <span class="position" v-show="this.$route.query.warehouseType == 1"
             >{{ deptBudgetList.binNumber }}仓位</span
           >
@@ -210,6 +210,7 @@
           <!--净重（吨）-->
           <ws-form-item label="扣款（元/吨）" span="1" prop="deductionAmount">
             <ws-input
+            @input="kkInput(deptBudgetList.deductionAmount)"
               v-model="deptBudgetList.deductionAmount"
               placeholder="请输入扣款金额"
               maxlength="120"
@@ -239,6 +240,7 @@
               v-model="deptBudgetList.agent"
               placeholder="请选择经办人"
               filterable
+              clearable
               :filter-method="dataFilter"
               @change="selectstaff"
             >
@@ -271,6 +273,7 @@
               placeholder
               class="typeselect"
               @change="selectstorageType"
+              :disabled="isSelectType"
             >
               <ws-option
                 v-for="item in storageType"
@@ -389,18 +392,7 @@
           </ws-info-table>
         </div>
       </div>
-      <ws-upload
-        ref="upload"
-        table-name="maintain_work_order"
-        oss-key="mainPlan"
-        :comp-id="compId"
-        :appendix-ids="appendixIdsAdd"
-        :vesselId="deptBudgetList.addressUrl"
-        :size-limit="size"
-        @uploadSuccess="uploadSuccess"
-        @onChange="onChange"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
+      <div class="small-title">上传磅单照片</div>
       <el-upload
         action="https://www.zthymaoyi.com/upload/admin"
         :show-file-list="false"
@@ -412,10 +404,10 @@
         class="avatar-uploader"
         accept=".jpg, .jpeg, .png, .gif"
       >
+      <el-button size="small" type="primary">点击上传</el-button>
       </el-upload>
-      <div>
+      <div v-if='deptBudgetList.addressUrl!=""'>
         <img
-          v-if="deptBudgetList.addressUrl"
           style="width: 100px; height: 100px"
           :src="deptBudgetList.addressUrl"
           alt=""
@@ -424,14 +416,32 @@
       <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
         <!--自检员-->
-        <ws-form-item label="质检员" span="1" prop="qualityInspector">
+        <!-- <ws-form-item label="质检员" span="1" prop="qualityInspector">
           <ws-input
             v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
             placeholder="请输入质检员姓名"
             maxlength="10"
             size="small"
           />
-        </ws-form-item>
+        </ws-form-item> -->
+                 
+        <ws-form-item label="自检员" span="1" prop="qualityInspector">
+            <el-select
+              v-model="deptBudgetList.warehouseInOutDetail.qualityInspector"
+              placeholder="请选择自检员"
+              filterable
+              clearable
+              :filter-method="qualityDataFilter"
+              @change="qualityInspectorChange"
+            >
+              <el-option
+                v-for="item in qualityInspectorList"
+                :key="item.value"
+                :label="item.staffName"
+                :value="item.staffName"
+              />
+            </el-select>
+          </ws-form-item>
       </div>
 
       <div class="neifor">
@@ -550,6 +560,9 @@ export default {
   },
   data() {
     return {
+      qualityInspectorList:[],
+      isGetCost:false,
+      isSelectType:true,
       //弹出框
       dialogViewSpareMoney: false,
       dialogApproveFormVisible: false,
@@ -616,10 +629,12 @@ export default {
         type: '干粮',
         freight: 0,
         cost: '',
+        addressUrl:'',
         warehouseInOutDetail: {},
+        deductionAmount:0,
       },
       historyList: [],
-
+      cost:'',
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -628,7 +643,7 @@ export default {
       accessoryTFs: false,
     }
   },
-  mounted() {
+  mounted() {debugger
     this.deptBudgetList.baseId = this.$route.query.baseId
     this.deptBudgetList.positionId = this.$route.query.positionId
     this.deptBudgetList.warehouseName = this.$route.query.warehouseName
@@ -638,17 +653,37 @@ export default {
     this.getList()
     this.deptBudgetList.grade = '一等品'
     this.deptBudgetList.gradeKey = '1'
-    if (this.deptBudgetList.warehouseType == 1) {
-      this.deptBudgetList.inOutType = '采购入库'
-      this.deptBudgetList.inOutTypeKey = '1'
-    } else {
-      this.deptBudgetList.inOutType = '退库'
-      this.deptBudgetList.inOutTypeKey = '1'
-    }
+       if(this.deptBudgetList.cost){
+        if(this.deptBudgetList.cost>val){
+           this.deptBudgetList.cost = this.cost - this.deptBudgetList.deductionAmount
+          }
+       else{
+         
+       }
+      }
+    // if (this.deptBudgetList.warehouseType == 1) {
+    //   this.deptBudgetList.inOutType = '采购入库'
+    //   this.deptBudgetList.inOutTypeKey = '1'
+    // } else {
+    //   this.deptBudgetList.inOutType = '退库'
+    //   this.deptBudgetList.inOutTypeKey = '1'
+    // }
   },
   methods: {
+    qualityInspectorChange(e){
+      console.log(e)
+    },
+    kkInput(val){debugger
+      console.log(val)
+      if(this.isGetCost){
+        if(this.deptBudgetList.cost>val){
+           this.deptBudgetList.cost = this.cost - this.deptBudgetList.deductionAmount
+          }
+      }
+    },
     uploadSuccessHandle1(res) {
       this.deptBudgetList.addressUrl = res.url
+      console.log(this.deptBudgetList.addressUrl)
     },
     dataFilter1(val) {
       console.log(val)
@@ -686,6 +721,7 @@ export default {
       }
     },
     editClick(status) {
+      this.isGetCost = false
       if (status == 1) {
         this.disabled1 = !this.disabled1
       } else {
@@ -923,7 +959,7 @@ export default {
         })
         return
       }
-      if (!this.deptBudgetList.cost) {
+      if (!this.deptBudgetList.freight) {
         this.$message({
           message: '运费不能为空',
           type: 'warning',
@@ -931,11 +967,11 @@ export default {
         return
       }
       if (
-        this.deptBudgetList.cost < 0 ||
-        this.deptBudgetList.cost > 100000 ||
-        (String(this.deptBudgetList.cost).indexOf('.') != -1 &&
-          String(this.deptBudgetList.cost).length -
-            (String(this.deptBudgetList.cost).indexOf('.') + 1) >
+        this.deptBudgetList.freight < 0 ||
+        this.deptBudgetList.freight > 100000 ||
+        (String(this.deptBudgetList.freight).indexOf('.') != -1 &&
+          String(this.deptBudgetList.freight).length -
+            (String(this.deptBudgetList.freight).indexOf('.') + 1) >
             2)
       ) {
         this.$message({
@@ -1440,19 +1476,20 @@ export default {
         })
         return
       }
-      if (!this.deptBudgetList.cost) {
+      if (!this.deptBudgetList.freight) {
         this.$message({
           message: '运费不能为空',
           type: 'warning',
         })
         return
       }
+      
       if (
-        this.deptBudgetList.cost < 0 ||
-        this.deptBudgetList.cost > 100000 ||
-        (String(this.deptBudgetList.cost).indexOf('.') != -1 &&
-          String(this.deptBudgetList.cost).length -
-            (String(this.deptBudgetList.cost).indexOf('.') + 1) >
+        this.deptBudgetList.freight < 0 ||
+        this.deptBudgetList.freight > 100000 ||
+        (String(this.deptBudgetList.freight).indexOf('.') != -1 &&
+          String(this.deptBudgetList.freight).length -
+            (String(this.deptBudgetList.freight).indexOf('.') + 1) >
             2)
       ) {
         this.$message({
@@ -1723,6 +1760,8 @@ export default {
                 sessionStorage.getItem('ws-pf_compId')
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.statusFlag = 1
+              let _data = JSON.parse(sessionStorage.getItem('winseaview-userInfo'))
+                this.dataList.backOffice  = _data.content.showCompName+'-' +_data.content.staffName
               addstorageputList(this.deptBudgetList)
                 .toPromise()
                 .then((response) => {
@@ -1765,12 +1804,26 @@ export default {
         )
       }
     },
-    contractNoChange(e) {
+    contractNoChange(e) {debugger
       for (var i = 0; i < this.outContractNo.length; i++) {
         if (this.outContractNo[i].contractNo == e) {
           this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
           this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
-          this.deptBudgetList.cost = this.outContractNo[i].contractPrice
+          // this.deptBudgetList.cost = this.outContractNo[i].contractPrice
+          this.cost = this.outContractNo[i].contractPrice
+          if(this.cost){
+            this.isGetCost = true
+              this.deptBudgetList.cost = this.cost - this.deptBudgetList.deductionAmount
+          }else{
+             this.isGetCost = false
+             this.deptBudgetList.cost = this.deptBudgetList.cost
+          }
+          this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
+          if(this.outContractNo[i].inOutType=='移库入库'){
+            this.isSelectType = false
+          }else{
+            this.isSelectType = true
+          }
           if (this.outContractNo[i].tranCarInfoList) {
             this.options2 = this.outContractNo[i].tranCarInfoList
             this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
@@ -1846,10 +1899,16 @@ export default {
         })
       // 类型
       if (this.deptBudgetList.warehouseType == '1') {
+        this.storageType = []
         pullDown({ constId: 'CON5' })
           .toPromise()
-          .then((response) => {
-            this.storageType = response
+          .then((response) => {debugger
+            // this.storageType = response
+            for(let i = 0;i<response.length;i++){
+                if(response[i].constValue=='移库入库'||response[i].constValue=='退库'){
+                  this.storageType.push(response[i])
+                }
+            }
           })
       } else if (this.deptBudgetList.warehouseType == '2') {
         pullDown({ constId: 'WARE1' })
@@ -1885,6 +1944,7 @@ export default {
         .toPromise()
         .then((response) => {
           this.options = response
+          this.qualityInspectorList = response
           this.staffList = response
           //  this.agent = response
         })