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

# Conflicts:
#	src/model/contarct/index.js

src/api/V2/contract/index.js

@@ -14,6 +14,8 @@ export const API_POST_CUSTOM_DOWN_EDIT = '/customDropDown/api/saveEdit'
 export const API_POST_CUSTOM_DOWN_DELETE = '/customDropDown/api/saveDelete'
 // 导出
 export const API_POST_EXPORT = '/contractManagementInfo/export'
+// 代收导出
+export const API_POST_EXPORT1 = '/contractManagementInfo/exportCollection'
 // 操作历史
 export const API_GET_BILL_OPERATE_HIS = '/billOperateHis/query/commonBillOperateHis'
 // 修改状态

src/components/WsUpload/index.vue

@@ -40,6 +40,7 @@
       <template v-slot:file="{ file }">
         <div class="thumbnail-group">
           <img
+          :src='file.url'
             class="el-upload-list__item-thumbnail"
             :class="getFileClass(file)"
           />

src/model/contarct/index.js

@@ -28,7 +28,8 @@ import {
     API_GET_RECORDPAGE,
     API_POST_ADDRECORD,
     API_GET_IDENTITYBYCARD,
-    API_POST_RECORDEDIT
+    API_POST_RECORDEDIT,
+    API_POST_EXPORT1
 } from '@/api/V2/contract'
 // 列表
 export const getList = appRx.get(API_GET_CONTRACT_TENANT, errorCatcher, errorHandle, filter)
@@ -45,6 +46,8 @@ export const editxiala = appRx.post(API_POST_CUSTOM_DOWN_EDIT, errorCatcher, err
 export const delxiala = appRx.post(API_POST_CUSTOM_DOWN_DELETE, errorCatcher, errorHandle, filter)
 // 导出
 export const export1 = appRx.get(API_POST_EXPORT)
+// 代收导出
+export const export2 = appRx.get(API_POST_EXPORT1)
 // 操作历史
 export const billoperatehis = appRx.get(API_GET_BILL_OPERATE_HIS, errorCatcher, errorHandle, filter)
 // 修改状态

src/views/contractManagement/collectionContract.vue

@@ -3,9 +3,9 @@
     <BaseHeaderLayout :leftSpan="8">
       <template slot="left">
         <ws-button type="primary" @click="handleAdd()"
-          v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`">添加</ws-button>
+          v-hasPermission="`contractManagement.dsContract.dsContractInfo.add`">添加</ws-button>
         <ws-button @click="exportlist()" v-hasPermission="
-            `contractManagement.buyContract.buyContractInfo.view`
+            `contractManagement.dsContract.dsContractInfo.view`
           ">导出</ws-button>
       </template>
       <template slot="right">
@@ -42,18 +42,18 @@
       <el-table-column prop="buyer" label="买方"> </el-table-column>
       <el-table-column prop="seller" label="卖方"> </el-table-column>
       <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
-      <el-table-column prop="completedQuantity" label="已完成（吨）">
+      <el-table-column prop="completed" label="已完成（吨）">
         <template slot-scope="scope">
           <span style="color: #5473e8; font-weight: 600">{{
-            scope.row.completedQuantity
+            scope.row.completed
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="buyer" label="应付（元）"> </el-table-column>
-      <el-table-column prop="buyer" label="已付（元）"> </el-table-column>
-      <el-table-column prop="buyer" label="应收（元）"> </el-table-column>
-      <el-table-column prop="buyer" label="已收（元）"> </el-table-column>
-      <el-table-column prop="buyer" label="已开销售发票（元）"> </el-table-column>
+      <el-table-column prop="amountIngPayable" label="应付（元）"> </el-table-column>
+      <el-table-column prop="amountEdPayableNew" label="已付（元）"> </el-table-column>
+      <el-table-column prop="amountNotCollectable" label="应收（元）"> </el-table-column>
+      <el-table-column prop="amountEdCollectionable" label="已收（元）"> </el-table-column>
+      <el-table-column width='200' prop="invoiced" label="已开销售发票（元）"> </el-table-column>
       <el-table-column prop="status" label="状态">
         <template slot-scope="scope">
           <span v-if="scope.row.approveStatus">{{
@@ -106,7 +106,7 @@
         <template slot-scope="scope">
           <img width="16" height="16" style="vertical-align: text-top; margin: 0 6px"
             src="../../../public/img/chakan.png" @click="handleExamine(scope.row)" v-hasPermission="
-              `contractManagement.buyContract.buyContractInfo.view`
+              `contractManagement.dsContract.dsContractInfo.view`
             " alt="" />
           <div v-if="
               (scope.row.approveStatus != '待决策人审核' &&
@@ -114,7 +114,7 @@
             " 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="
-                `contractManagement.buyContract.buyContractInfo.edit`
+                `contractManagement.dsContract.dsContractInfo.edit`
               " alt="" />
           </div>
           <img width="16" height="17" style="
@@ -124,7 +124,7 @@
               margin: 0 6px;
             " v-if="scope.row.status != '执行中'&&scope.row.status != '已完成'" src="../../../public/img/shanchu.png"
             v-hasPermission="
-              `contractManagement.buyContract.buyContractInfo.delete`
+              `contractManagement.dsContract.dsContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
           <img width="16" height="17" style="
                 vertical-align: text-top;
@@ -133,7 +133,7 @@
                 margin: 0 6px;
               "  src="../../../public/img/jl.png"
             v-hasPermission="
-                `contractManagement.buyContract.buyContractInfo.delete`
+                `contractManagement.dsContract.dsContractInfo.list`
               " @click="handleRecord(scope.row)" alt="" />
         </template>
       </el-table-column>
@@ -152,7 +152,7 @@
 <script>
   import {
     getList,
-    export1,
+    export2,
     editstatus,
     billoperatehis,
     deletecontract,
@@ -353,7 +353,7 @@
         console.log(`当前页: ${val}`)
         this.getList()
       },
-      getList() {debugger
+      getList() {
         getList({
             compId: localStorage.getItem('ws-pf_compId'),
             contractType: this.contractType,
@@ -501,7 +501,7 @@
       async exportlist() {
         const {
           data
-        } = await export1({
+        } = await export2({
           compId: localStorage.getItem('ws-pf_compId'),
           contractType: this.contractType,
           goodsType: this.goodsType,

src/views/contractManagement/collectionContractAdd.vue

@@ -34,7 +34,7 @@
           <ws-form-item label="买方" span="1" prop="buyer" class="readonly">
             <el-select v-model="deptBudgetList.buyer" placeholder="请选择买方名称" class="typeselect" filterable clearable
               @change="buyerSelect">
-              <el-option v-for="item in customerinfo" :key="item.customerName" :label="item.customerName"
+              <el-option v-for="(item,index) in customerinfo" :key="index" :label="item.customerName"
                 :value="item.customerName" />
             </el-select>
           </ws-form-item>
@@ -133,8 +133,8 @@
             <ws-input v-model="deptBudgetList.finalTradingVolume" placeholder="请输入最终实际成交量" maxlength="100"
               size="small" />
           </ws-form-item>
-          <ws-form-item label="临时仓库负责人" span="1" prop="packingMethod">
-            <el-select v-model="deptBudgetList.personPhone" multiple placeholder="请选择临时仓库负责人" filterable clearable
+          <ws-form-item label="代收库负责人" span="1" prop="packingMethod">
+            <el-select v-model="deptBudgetList.personPhone" multiple placeholder="请选择代收库负责人" filterable clearable
               @change="selectstaff">
               <el-option v-for="item in options" :key="item.value" :label="item.staffName"
                 :value="item.staffMobilePhone" />
@@ -366,7 +366,7 @@
         ChapterTwoList: [],
         deptBudgetList: {
           deliverType: '1',
-          agreementType: '销售合同',
+          agreementType: '代收合同',
           finalTradingVolume: 0,
           totalContractPrice: 0,
           contractGoodsInfo: {
@@ -406,7 +406,7 @@
         feedbackLeaders: [], //收货反馈负责人
       }
     },
-    activated() {debugger
+    activated() {
       // this.newSelectedOptions = '请选择货源所在地'
       this.newSelectedOptions1 = '请选择交货所在地'
       this.deptBudgetList.packingMethod = '散装'
@@ -423,7 +423,7 @@
         .toPromise()
         .then((response) => {
           this.options = response
-          // this.staffList = response
+          this.staffList = response
         })
       this.loaddata()
       // this.showType = this.isShow
@@ -456,7 +456,7 @@
         this.deptBudgetList.feedbackLeaderPhone = this.feedbackLeaders[e].staffMobilePhone
       },
       buyerSelect(item) {
-        console.log(item)
+        // console.log(item)
         for (let i = 0; i < this.customerinfo.length; i++) {
           console.log(this.customerinfo[i].customerName, item)
           if (this.customerinfo[i].customerName == item) {
@@ -541,7 +541,7 @@
       returnsales() {
         this.deptBudgetList = {
           deliverType: '1',
-          agreementType: '销售合同',
+          agreementType: '代收合同',
           finalTradingVolume: 0,
           totalContractPrice: 0,
           contractGoodsInfo: {
@@ -555,10 +555,11 @@
           settlementWeightMethod: '1',
         }
         this.$router.push({
-          path: 'salesContract',
+          path: 'collectionContract',
         })
       },
-      loaddata() {debugger
+      loaddata() {
+        this.getUnitList()
         packList({
             constId: 'CON2',
           })
@@ -653,14 +654,7 @@
       },
 
       submit() {
-        if (this.deptBudgetList.placeDelivery.indexOf('省') > -1) {
-          this.$message({
-            message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
-            type: 'warning',
-          })
-          return
-        }
-        // if (this.deptBudgetList.sourceGoods.indexOf('省') > -1) {
+        // if (this.deptBudgetList.placeDelivery.indexOf('省') > -1) {
         //   this.$message({
         //     message: '请手动删除详细地址中省市区/市，避免重复显示省市区/市！',
         //     type: 'warning',
@@ -684,23 +678,7 @@
           })
           return
         }
-        if (!this.deptBudgetList.shippingType) {
-          this.$message({
-            message: '运输方式不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          this.deptBudgetList.shippingType.length < 1 ||
-          this.deptBudgetList.shippingType.length > 20
-        ) {
-          this.$message({
-            message: '运输方式长度不符合要求,请输入1到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
+        
         if (!this.deptBudgetList.buyer) {
           this.$message({
             message: '买方名称不能为空',
@@ -774,15 +752,15 @@
           })
           return
         }
-        if (this.deptBudgetList.deliverType == '2') {
-          if (!this.deptBudgetList.feedbackLeader) {
-            this.$message({
-              message: '请选择收货反馈负责人',
-              type: 'warning',
-            })
-            return
-          }
-        }
+        // if (this.deptBudgetList.deliverType == '2') {
+        //   if (!this.deptBudgetList.feedbackLeader) {
+        //     this.$message({
+        //       message: '请选择收货反馈负责人',
+        //       type: 'warning',
+        //     })
+        //     return
+        //   }
+        // }
 
         if (!this.deptBudgetList.acceptanceMethod) {
           this.$message({
@@ -813,6 +791,35 @@
           })
           return
         }
+        if (!this.deptBudgetList.agencyCharge) {
+          this.$message({
+            message: '代收费不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.grainDelivery) {
+          this.$message({
+            message: '客户送粮上限不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          isNaN(this.deptBudgetList.agencyCharge) ||
+          (String(this.deptBudgetList.agencyCharge).indexOf('.') != -1 &&
+            String(this.deptBudgetList.agencyCharge).length -
+            (String(this.deptBudgetList.agencyCharge).indexOf('.') + 1) >
+            2) ||
+          this.deptBudgetList.agencyCharge < 0 ||
+          this.deptBudgetList.agencyCharge > 1000
+        ) {
+          this.$message({
+            message: '代收费填写错误！',
+            type: 'warning',
+          })
+          return
+        }
         if (!this.deptBudgetList.deliveryDateStart) {
           this.$message({
             message: '请选择交货日期（起）',
@@ -860,74 +867,6 @@
           })
           return
         }
-        if (!this.deptBudgetList.priceType) {
-          this.$message({
-            message: '请选择价格类型',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.deptBudgetList.priceType == '定价销售') {
-          if (!this.deptBudgetList.unitContractPrice) {
-            this.$message({
-              message: '请输入合同单价！',
-              type: 'warning',
-            })
-            return
-          }
-          if (
-            isNaN(this.deptBudgetList.unitContractPrice) ||
-            (String(this.deptBudgetList.unitContractPrice).indexOf('.') != -1 &&
-              String(this.deptBudgetList.unitContractPrice).length -
-              (String(this.deptBudgetList.unitContractPrice).indexOf('.') + 1) >
-              2) ||
-            this.deptBudgetList.unitContractPrice <= 0 ||
-            this.deptBudgetList.unitContractPrice > 10000
-          ) {
-            this.$message({
-              message: '合同单价输入有误！',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.deptBudgetList.totalContractPrice) {
-            this.$message({
-              message: '请输入合同总价！',
-              type: 'warning',
-            })
-            return
-          }
-          if (
-            isNaN(this.deptBudgetList.totalContractPrice) ||
-            (String(this.deptBudgetList.totalContractPrice).indexOf('.') != -1 &&
-              String(this.deptBudgetList.totalContractPrice).length -
-              (String(this.deptBudgetList.totalContractPrice).indexOf('.') +
-                1) >
-              2) ||
-            this.deptBudgetList.totalContractPrice <= 0 ||
-            this.deptBudgetList.totalContractPrice > 1000000000
-          ) {
-            this.$message({
-              message: '合同总价输入有误！',
-              type: 'warning',
-            })
-            return
-          }
-        }
-        if (!this.newSelectedOptions) {
-          this.$message({
-            message: '请选择货源所在地区！',
-            type: 'warning',
-          })
-          return
-        }
-        // if (!this.deptBudgetList.sourceGoods) {
-        //   this.$message({
-        //     message: '请输入货源详细地址！',
-        //     type: 'warning',
-        //   })
-        //   return
-        // }
         if (!this.newSelectedOptions1) {
           this.$message({
             message: '请选择交货所在地区！',
@@ -1239,8 +1178,11 @@
         }
         this.$refs.deptBudgetList.validate((valid) => {
           if (valid) {
+            if(this.deptBudgetList.personPhone){
+              this.deptBudgetList.personPhone=this.deptBudgetList.personPhone.toString()
+            }
             this.deptBudgetList.compId = this.compId
-            this.deptBudgetList.contractType = 1
+            this.deptBudgetList.contractType = 3
             this.deptBudgetList.goodsType = 1
             addList(this.deptBudgetList)
               .toPromise()
@@ -1323,7 +1265,7 @@
                 this.$message.success('添加成功')
                 this.deptBudgetList = {
                   deliverType: '1',
-                  agreementType: '销售合同',
+                  agreementType: '代收合同',
                   finalTradingVolume: 0,
                   totalContractPrice: 0,
                   contractGoodsInfo: {
@@ -1338,7 +1280,7 @@
                 }
 
                 this.$router.push({
-                  path: 'salesContract',
+                  path: 'collectionContract',
                 })
               })
           } else {

src/views/contractManagement/collectionContractEdit.vue

@@ -130,25 +130,6 @@
            <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
              value-format="yyyy-MM-dd" />
          </ws-form-item>
-   <!-- 货源所在地区 -->
-          <ws-form-item label="货源所在地区" span="1" prop="sourceGoods">
-            <!-- <el-cascader
-              :options="options_"
-              v-model="selectedOptions"
-              clearable
-              size="large"
-              placeholder="请选择货源所在地区"
-              style="width: 200%"
-              @change="handleChange"
-            /> -->
-            <el-button @click="mapInputClick('source')" class="address-btn">
-              {{ newSelectedOptions }}
-            </el-button>
-          </ws-form-item>
-          <!-- 货源详细地址 -->
-          <ws-form-item label="货源详细地址" span="1" prop="sourceGoods">
-            <ws-input v-model="deptBudgetList.sourceGoods" maxlength="100" placeholder="请输入货源详细地址" size="small" />
-          </ws-form-item>
           <!-- 交货地所在地区 -->
           <ws-form-item label="交货地所在地区" span="1" prop="placeDelivery">
             <!-- <el-cascader
@@ -342,6 +323,7 @@
     editxiala,
     delxiala,
     getRelationContractNo,
+    getstafffind
   } from '@/model/contarct/index'
   import { getstaff, } from '@/model/warehouse/index'
   export default {
@@ -378,6 +360,7 @@
         // 提交类型
         submitType: true,
         options_: regionData,
+        options:[],
         selectedOptions: [],
         selectedOptions1: [],
         tableData: [{
@@ -427,6 +410,14 @@
       //cg.viewBudget
       //cg.viewSpareMoney
       // this.getVesselData();
+      getstafffind({
+          roles: 'd6a5c8a52da544309259f91f75de1ec6'
+        })
+        .toPromise()
+        .then((response) => {
+          this.options = response
+          this.staffList = response
+        })
       this.loaddata()
       this.editInfo()
       this.showType = this.isShow
@@ -434,6 +425,18 @@
       this.showType = this.isShow
     },
     methods: {
+      selectstaff(e) {
+        this.deptBudgetList.personCharge = ''
+        for (var i = 0; i < this.staffList.length; i++) {
+          for (var j = 0; j < e.length; j++) {
+            if (this.staffList[i].staffMobilePhone == e[j]) {
+              this.deptBudgetList.personCharge += this.staffList[i].staffName + ' ' + this.staffList[i]
+                .staffMobilePhone + ','
+            }
+          }
+        }
+        console.log(this.deptBudgetList)
+      },
        feedbackLeaderChange(e){
         this.deptBudgetList.feedbackLeader = this.feedbackLeaders[e].staffName
         this.deptBudgetList.feedbackLeaderPhone = this.feedbackLeaders[e].staffMobilePhone
@@ -478,7 +481,7 @@
       returnsales() {
         this.deptBudgetList = {}
         this.$router.push({
-          path: 'salesContract'
+          path: 'collectionContract'
         })
       },
       handleChange(value) {
@@ -506,18 +509,18 @@
           })
           .toPromise()
           .then((response) => {
-            var tmp = []
-            tmp[0] = TextToCode[response.sourceProvince].code
-            tmp[1] = TextToCode[response.sourceProvince][response.sourceCity].code
-            if (tmp[0] == 810000 || tmp[0] == 820000) {
-              tmp[2] = null
-            } else {
-              tmp[2] =
-                TextToCode[response.sourceProvince][response.sourceCity][
-                  response.sourceArea
-                ].code
-            }
-            this.selectedOptions = tmp
+            // var tmp = []
+            // tmp[0] = TextToCode[response.sourceProvince].code
+            // tmp[1] = TextToCode[response.sourceProvince][response.sourceCity].code
+            // if (tmp[0] == 810000 || tmp[0] == 820000) {
+            //   tmp[2] = null
+            // } else {
+            //   tmp[2] =
+            //     TextToCode[response.sourceProvince][response.sourceCity][
+            //       response.sourceArea
+            //     ].code
+            // }
+            // this.selectedOptions = tmp
             var tmp1 = []
             tmp1[0] = TextToCode[response.deliveryProvince].code
             tmp1[1] =
@@ -533,6 +536,16 @@
 
             this.selectedOptions1 = tmp1
             this.deptBudgetList = response
+            var name=[]
+            this.deptBudgetList.personPhone=this.deptBudgetList.personPhone.split(',')
+            // var arr=this.deptBudgetList.personCharge.split(',')
+            // for (let i = 0; i < arr.length; i++) {
+            //   if(arr[i].split(' ')[0]!=''){
+            //     name.push(arr[i].split(' ')[0])
+            //   }
+            // }
+            // this.
+            // console.log(name)
             if (this.deptBudgetList.deliverType == 1) {
               this.deptBudgetList.deliverType1 = '我方送货'
             } else if (this.deptBudgetList.deliverType == 2) {
@@ -709,23 +722,7 @@
           })
           return
         }
-        if (!this.deptBudgetList.shippingType) {
-          this.$message({
-            message: '运输方式不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          this.deptBudgetList.shippingType.length < 1 ||
-          this.deptBudgetList.shippingType.length > 20
-        ) {
-          this.$message({
-            message: '运输方式长度不符合要求,请输入1到20个字符之内！',
-            type: 'warning',
-          })
-          return
-        }
+        
         if (!this.deptBudgetList.buyer) {
           this.$message({
             message: '买方名称不能为空',
@@ -778,13 +775,13 @@
           })
           return
         }
-        if (isNaN(this.deptBudgetList.buyerPhone)) {
-          this.$message({
-            message: '输入买方电话有误!',
-            type: 'warning',
-          })
-          return
-        }
+        // if (isNaN(this.deptBudgetList.buyerPhone)) {
+        //   this.$message({
+        //     message: '输入买方电话有误!',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.deptBudgetList.sellerPhone) {
           this.$message({
             message: '请输入卖方电话！',
@@ -799,15 +796,15 @@
           })
           return
         }
-        if(this.deptBudgetList.deliverType == '2'){
-          if (!this.deptBudgetList.feedbackLeader){
-          this.$message({
-            message: '请选择收货反馈负责人',
-            type: 'warning',
-          })
-          return
-        }
-        }
+        // if (this.deptBudgetList.deliverType == '2') {
+        //   if (!this.deptBudgetList.feedbackLeader) {
+        //     this.$message({
+        //       message: '请选择收货反馈负责人',
+        //       type: 'warning',
+        //     })
+        //     return
+        //   }
+        // }
 
         if (!this.deptBudgetList.acceptanceMethod) {
           this.$message({
@@ -838,107 +835,78 @@
           })
           return
         }
-        if (!this.deptBudgetList.deliveryDateStart) {
+        if (!this.deptBudgetList.agencyCharge) {
           this.$message({
-            message: '请选择交货日期（起）',
+            message: '代收费不能为空！',
             type: 'warning',
           })
           return
         }
-        if (!this.deptBudgetList.overShort) {
+        if (!this.deptBudgetList.grainDelivery) {
           this.$message({
-            message: '请输入溢短装！',
+            message: '客户送粮上限不能为空！',
             type: 'warning',
           })
           return
         }
         if (
-          isNaN(this.deptBudgetList.overShort) ||
-          (String(this.deptBudgetList.overShort).indexOf('.') != -1 &&
-            String(this.deptBudgetList.overShort).length -
-            (String(this.deptBudgetList.overShort).indexOf('.') + 1) >
+          isNaN(this.deptBudgetList.agencyCharge) ||
+          (String(this.deptBudgetList.agencyCharge).indexOf('.') != -1 &&
+            String(this.deptBudgetList.agencyCharge).length -
+            (String(this.deptBudgetList.agencyCharge).indexOf('.') + 1) >
             2) ||
-          this.deptBudgetList.overShort < 0 ||
-          this.deptBudgetList.overShort > 50
+          this.deptBudgetList.agencyCharge < 0 ||
+          this.deptBudgetList.agencyCharge > 1000
         ) {
           this.$message({
-            message: '溢短装输入有误！',
+            message: '代收费填写错误！',
             type: 'warning',
           })
           return
         }
-        if (!this.deptBudgetList.deliveryDateEnd) {
-          this.$message({
-            message: '请选择交货日期（止）',
-            type: 'warning',
-          })
-          return
-        }
-        //时间
-        if (
-          new Date(this.deptBudgetList.deliveryDateStart).getTime() >
-          new Date(this.deptBudgetList.deliveryDateEnd).getTime()
-        ) {
+        if (!this.deptBudgetList.deliveryDateStart) {
           this.$message({
-            message: '交货日期（止）选择错误',
+            message: '请选择交货日期（起）',
             type: 'warning',
           })
           return
         }
-        if (!this.deptBudgetList.unitContractPrice) {
+        if (!this.deptBudgetList.overShort) {
           this.$message({
-            message: '请输入合同单价！',
+            message: '请输入溢短装！',
             type: 'warning',
           })
           return
         }
         if (
-          isNaN(this.deptBudgetList.unitContractPrice) ||
-          (String(this.deptBudgetList.unitContractPrice).indexOf('.') != -1 &&
-            String(this.deptBudgetList.unitContractPrice).length -
-            (String(this.deptBudgetList.unitContractPrice).indexOf('.') + 1) >
+          isNaN(this.deptBudgetList.overShort) ||
+          (String(this.deptBudgetList.overShort).indexOf('.') != -1 &&
+            String(this.deptBudgetList.overShort).length -
+            (String(this.deptBudgetList.overShort).indexOf('.') + 1) >
             2) ||
-          this.deptBudgetList.unitContractPrice <= 0 ||
-          this.deptBudgetList.unitContractPrice > 10000
+          this.deptBudgetList.overShort < 0 ||
+          this.deptBudgetList.overShort > 50
         ) {
           this.$message({
-            message: '合同单价输入有误！',
+            message: '溢短装输入有误！',
             type: 'warning',
           })
           return
         }
-        if (!this.deptBudgetList.totalContractPrice) {
+        if (!this.deptBudgetList.deliveryDateEnd) {
           this.$message({
-            message: '请输入合同总价！',
+            message: '请选择交货日期（止）',
             type: 'warning',
           })
           return
         }
+        //时间
         if (
-          isNaN(this.deptBudgetList.totalContractPrice) ||
-          (String(this.deptBudgetList.totalContractPrice).indexOf('.') != -1 &&
-            String(this.deptBudgetList.totalContractPrice).length -
-            (String(this.deptBudgetList.totalContractPrice).indexOf('.') + 1) >
-            2) ||
-          this.deptBudgetList.totalContractPrice <= 0 ||
-          this.deptBudgetList.totalContractPrice > 1000000000
+          new Date(this.deptBudgetList.deliveryDateStart).getTime() >
+          new Date(this.deptBudgetList.deliveryDateEnd).getTime()
         ) {
           this.$message({
-            message: '合同总价输入有误！',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.newSelectedOptions) {
-          this.$message({
-            message: '请选择货源所在地区！',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.sourceGoods) {
-          this.$message({
-            message: '请输入货源详细地址！',
+            message: '交货日期（止）选择错误',
             type: 'warning',
           })
           return
@@ -995,12 +963,18 @@
           return
         }
         if (
-          this.deptBudgetList.contractGoodsInfo.waterContent &&
-          String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') != -1 &&
-          String(this.deptBudgetList.contractGoodsInfo.waterContent).length -
-          (String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf('.') + 1) >
-          2 || this.deptBudgetList.contractGoodsInfo.waterContent > 40 || this.deptBudgetList.contractGoodsInfo
-          .waterContent < 0
+          (this.deptBudgetList.contractGoodsInfo.waterContent &&
+            String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf(
+              '.'
+            ) != -1 &&
+            String(this.deptBudgetList.contractGoodsInfo.waterContent).length -
+            (String(this.deptBudgetList.contractGoodsInfo.waterContent).indexOf(
+                '.'
+              ) +
+              1) >
+            2) ||
+          this.deptBudgetList.contractGoodsInfo.waterContent > 40 ||
+          this.deptBudgetList.contractGoodsInfo.waterContent < 0
         ) {
           this.$message({
             message: '水分输入错误',
@@ -1023,11 +997,17 @@
           return
         }
         if (
-          this.deptBudgetList.contractGoodsInfo.impurity &&
-          String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') != -1 &&
-          String(this.deptBudgetList.contractGoodsInfo.impurity).length -
-          (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') + 1) >
-          2 || this.deptBudgetList.contractGoodsInfo.impurity > 40 || this.deptBudgetList.contractGoodsInfo.impurity < 0
+          (this.deptBudgetList.contractGoodsInfo.impurity &&
+            String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') !=
+            -1 &&
+            String(this.deptBudgetList.contractGoodsInfo.impurity).length -
+            (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf(
+                '.'
+              ) +
+              1) >
+            2) ||
+          this.deptBudgetList.contractGoodsInfo.impurity > 40 ||
+          this.deptBudgetList.contractGoodsInfo.impurity < 0
         ) {
           this.$message({
             message: '杂质输入错误',
@@ -1044,11 +1024,17 @@
         }
         if (
           (this.deptBudgetList.contractGoodsInfo.bulkDensity &&
-            String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') != -1 &&
+            String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf(
+              '.'
+            ) != -1 &&
             String(this.deptBudgetList.contractGoodsInfo.bulkDensity).length -
-            (String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') + 1) >
-            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo
-          .bulkDensity < 0
+            (String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf(
+                '.'
+              ) +
+              1) >
+            2) ||
+          this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 ||
+          this.deptBudgetList.contractGoodsInfo.bulkDensity < 0
         ) {
           this.$message({
             message: '容重输入错误',
@@ -1073,8 +1059,9 @@
                 '.'
               ) +
               1) >
-            2 || this.deptBudgetList.contractGoodsInfo.mildewGrain > 40 || this.deptBudgetList.contractGoodsInfo
-            .mildewGrain < 0)
+            2) ||
+          this.deptBudgetList.contractGoodsInfo.mildewGrain > 40 ||
+          this.deptBudgetList.contractGoodsInfo.mildewGrain < 0
         ) {
           this.$message({
             message: '霉变粒输入错误',
@@ -1098,8 +1085,9 @@
                 '.'
               ) +
               1) >
-            2 || this.deptBudgetList.contractGoodsInfo.jiaorenli > 40 || this.deptBudgetList.contractGoodsInfo
-            .jiaorenli < 0)
+            2) ||
+          this.deptBudgetList.contractGoodsInfo.jiaorenli > 40 ||
+          this.deptBudgetList.contractGoodsInfo.jiaorenli < 0
         ) {
           this.$message({
             message: '热损伤输入错误',
@@ -1124,8 +1112,9 @@
                 this.deptBudgetList.contractGoodsInfo.imperfectGrain
               ).indexOf('.') +
               1) >
-            2 || this.deptBudgetList.contractGoodsInfo.imperfectGrain > 40 || this.deptBudgetList.contractGoodsInfo
-            .imperfectGrain < 0)
+            2) ||
+          this.deptBudgetList.contractGoodsInfo.imperfectGrain > 40 ||
+          this.deptBudgetList.contractGoodsInfo.imperfectGrain < 0
         ) {
           this.$message({
             message: '不完善粒输入错误',
@@ -1133,31 +1122,31 @@
           })
           return
         }
-        if(this.deptBudgetList.contractProcessInfo.goodsNameKey){
+        if (this.deptBudgetList.contractProcessInfo.goodsNameKey) {
 
-        if (
-          (!this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000) ||
-          (this.deptBudgetList.contractProcessInfo.goodsNameKey < 100) ||
-          (String(this.deptBudgetList.contractProcessInfo.goodsNameKey).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractProcessInfo.goodsNameKey).length -
-            (String(
-                this.deptBudgetList.contractProcessInfo.goodsNameKey
-              ).indexOf('.') +
-              1) >
-            2)
-        ) {
-          this.$message({
-            message: '合同收入金额输入错误',
-            type: 'warning',
-          })
-          return
-        }
+          if (
+            !this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000 ||
+            this.deptBudgetList.contractProcessInfo.goodsNameKey < 100 ||
+            (String(this.deptBudgetList.contractProcessInfo.goodsNameKey).indexOf(
+                '.'
+              ) != -1 &&
+              String(this.deptBudgetList.contractProcessInfo.goodsNameKey).length -
+              (String(
+                  this.deptBudgetList.contractProcessInfo.goodsNameKey
+                ).indexOf('.') +
+                1) >
+              2)
+          ) {
+            this.$message({
+              message: '合同收入金额输入错误',
+              type: 'warning',
+            })
+            return
+          }
         }
         if (
-          (this.deptBudgetList.contractProcessInfo.waterContent > 10000000) ||
-          (this.deptBudgetList.contractProcessInfo.waterContent < 0) ||
+          this.deptBudgetList.contractProcessInfo.waterContent > 10000000 ||
+          this.deptBudgetList.contractProcessInfo.waterContent < 0 ||
           (String(this.deptBudgetList.contractProcessInfo.waterContent).indexOf(
               '.'
             ) != -1 &&
@@ -1247,7 +1236,7 @@
                     this.$message.success('编辑成功')
                     this.deptBudgetList = {}
                     this.$router.push({
-                      path: 'salesContract'
+                      path: 'collectionContract'
                     })
                   })
               } else {

src/views/contractManagement/collectionContractExamine.vue

@@ -81,16 +81,6 @@
         <ws-form-item label="签订日期" span="1" prop="signingDate">
           {{ deptBudgetList.signingDate }}
         </ws-form-item>
-
-
-        <ws-form-item label="货源所在地区" span="1">
-          {{ deptBudgetList.sourceProvince }}
-          {{ deptBudgetList.sourceCity }}
-          {{ deptBudgetList.sourceArea }}
-        </ws-form-item>
-        <ws-form-item label="货源详细地址" span="1" prop="sourceGoods">
-          {{ deptBudgetList.sourceGoods }}
-        </ws-form-item>
         <ws-form-item label="交货地所在地区" span="1">
           {{ deptBudgetList.deliveryProvince }}
           {{ deptBudgetList.deliveryCity }}

src/views/contractManagement/component/routers/route.js

@@ -323,7 +323,7 @@ const contractManagementRouter = {
       meta: {
         title: 'collectionContract',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.buyContract',
+        module: 'contractManagement.dsContract',
         permissicon: [],
         keepAlive: true
       }
@@ -337,7 +337,7 @@ const contractManagementRouter = {
       meta: {
         title: 'collectionContractAdd',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.buyContract.buyContractInfo.add',
+        module: 'contractManagement.dsContract.dsContractInfo.add',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -353,7 +353,7 @@ const contractManagementRouter = {
       meta: {
         title: 'collectionContractEdit',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.salesContract.salesContractInfo.edit',
+        module: 'contractManagement.dsContract.dsContractInfo.edit',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -369,7 +369,7 @@ const contractManagementRouter = {
       meta: {
         title: 'collectionContractExamine',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.salesContract.salesContractInfo.view',
+        module: 'contractManagement.dsContract.dsContractInfo.view',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -385,7 +385,7 @@ const contractManagementRouter = {
       meta: {
         title: 'collectionContractRecord',
         shortcutEntrance: 'contractManagement',
-        module: 'contractManagement.salesContract.salesContractInfo.view',
+        module: 'contractManagement.dsContract.dsContractInfo.list',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'

src/views/contractManagement/salesContractAdd.vue

@@ -93,9 +93,9 @@
           </ws-form-item>
           <!-- 收货反馈负责人 -->
           <ws-form-item label="收货反馈负责人" span="1" prop="feedbackLeader" v-if="deptBudgetList.deliverType == '2'">
-            <ws-select v-model="deptBudgetList.feedbackLeader" placeholder="请输入收货反馈负责人" class="typeselect" @change="feedbackLeaderChange">
+            <el-select v-model="deptBudgetList.feedbackLeader" filterable placeholder="请输入收货反馈负责人" class="typeselect" @change="feedbackLeaderChange">
               <ws-option v-for="(item,index ) in feedbackLeaders" :key="item.staffId" :label="item.staffName" :value="index" />
-            </ws-select>
+            </el-select>
           </ws-form-item>
           <!--包装方式-->
           <ws-form-item label="包装方式" span="1" prop="packingMethod">

src/views/warehouse/warehouseManagementRecord.vue

@@ -440,7 +440,7 @@
 	     	},
 			selectInit(row){
 				 //在这里一定要记得类型匹配的上。
-				if (row.inOutType != '收购入库' && row.inOutType != '期初') {
+				if (row.inOutType != '收购入库' && row.inOutType != '期初'&& row.inOutType != '折转入库'&& row.inOutType != '折转出库') {
 					return true
 				} else  {
 				return false