前端

src/views/outboundManagement/weighingManagementNew.vue

@@ -2135,7 +2135,7 @@
             } else if (this.outContractNo[i].inOutType == '移库出库') {
               for (let q = 0; q < this.warehouseList1.length; q++) {
                 if (this.warehouseList1[q].warehouseName == this.warehouseName) {
-                  if(this.warehouseList1[q].warehouseType==2&&this.warehouseList1[q].createType==1&&this.outContractNo[i].priceType=='定价销售'){
+                  if(this.warehouseList1[q].warehouseType==2&&this.warehouseList1[q].createType==1&&this.outContractNo[i].priceType=='定价采购'){
                     // console.log(this.outContractNo[i].contractPrice,11111111111)
                     this.priceedit=true
                     this.weighingList.contractPrice=this.outContractNo[i].contractPrice

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -567,6 +567,7 @@ export default {
         if (this.contractNoList[i].contractNo == val) {
             this.deptBudgetList.goodsName = this.contractNoList[i].goodsName
             this.deptBudgetList.weight= this.contractNoList[i].weight
+            this.deptBudgetList.tranProcessInfoList[0].weight= this.contractNoList[i].weight
             console.log(this.contractNoList[i])
             if(this.contractNoList[i].inOutType){
               this.deptBudgetList.sendWarehouse = this.contractNoList[i].sendWarehouse
@@ -689,7 +690,7 @@ export default {
     loaddata() {
       this.deptBudgetList.taskNo = 'YS' + this.getdate() + this.MathRand()
       this.deptBudgetList.tranProcessInfoList[0].processNo =
-        this.deptBudgetList.taskNo + '-1'
+        this.deptBudgetList.taskNo 
       // 货名
       packList({ constId: 'CON2' })
         .toPromise()

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -208,7 +208,7 @@
 					</el-form-item>
 					<!--重量（吨）-->
 					<el-form-item label="重量（吨）">
-						<el-input :disabled='dataList1.inOutType=="收购入库"' @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量（吨）"
+						<el-input :disabled='dataList1.inOutType=="收购入库"||dataList1.inOutType=="移库入库"' @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量（吨）"
 							maxlength="120" size="small" class="huom" />
 					</el-form-item>
 					<!-- 品级 -->

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -240,7 +240,7 @@
           </el-form-item>
           <!--重量（吨）-->
           <el-form-item label="重量（吨）">
-            <el-input @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量（吨）" maxlength="120"
+            <el-input :disabled='dataList1.inOutType=="收购入库"||dataList1.inOutType=="移库入库"' @input="weightchange" v-model="dataList1.weight" placeholder="请输入重量（吨）" maxlength="120"
               size="small" class="huom" />
           </el-form-item>
           <!-- 品级 -->

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -102,7 +102,7 @@
         <template slot-scope="scope">
           <template v-if="scope.row.receivingStatus != '已完货'">
             <div class="record" @click="trainSee(scope.row)">查看</div>
-            <div class="adjustment" @click="feedback(scope.row)">反馈</div>
+            <div v-if="scope.row.tranType!='移库'" class="adjustment" @click="feedback(scope.row)">反馈</div>
           </template>
           <template v-else>
             <div class="record1" @click="trainSee(scope.row)">查看</div>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -101,7 +101,7 @@
         <template slot-scope="scope">
           <template v-if="scope.row.feedbackStatus != '已完货'">
             <div class="record" @click="trainSee(scope.row)">查看</div>
-            <div class="adjustment" @click="feedback(scope.row)">反馈</div>
+            <div v-if="scope.row.tranType!='移库'&&scope.row.tranType!='销售出库'" class="adjustment" @click="feedback(scope.row)">反馈</div>
           </template>
           <template v-else>
             <div class="record1" @click="trainSee(scope.row)">查看</div>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -649,6 +649,8 @@
       },
       //审核
       examine(status) {
+        
+        
         this.$prompt('运输单价审核', {
           cancelButtonText: '取消',
           confirmButtonText: '确定',
@@ -687,6 +689,21 @@
         });
       },
       priceSubmit(status) {
+        console.log(status,this.deptBudgetList.tranPriceIng,this.deptBudgetList.tranPriceIngCar)
+        if(status==1&&!this.deptBudgetList.tranPriceIng){
+          this.$message({
+            message: '请输入运输单价元/吨！',
+            type: 'warning',
+          })
+          return
+        }
+        if(status==2&&!this.deptBudgetList.tranPriceIngCar){
+          this.$message({
+            message: '请输入运输单价元/车！',
+            type: 'warning',
+          })
+          return
+        }
         this.$confirm(`运输单价将发送给决策人审核，确定提交？`, {
             cancelButtonText: '取消',
             confirmButtonText: '确定',