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

public/static/inspection.html

@@ -52,10 +52,12 @@
        
       } 
       img,.left {
-        width: 120px;
-        height: 120px;
+        width: 110px;
+        height: 110px;
         /* margin-right: 118px; */
-        position: absolute
+        position: absolute;
+          right: 20px;
+          top: 12px;
       }
 
       .config {
@@ -74,7 +76,8 @@
 
       .number {
         text-align: right;
-        margin-bottom: 10px;
+        /* margin-bottom: 10px; */
+        margin: 10px 0;
       }
 
       .small-row {
@@ -121,11 +124,12 @@
     <div id="app">
       <div class="content" v-if="bigContent">
         <div>
-            <div class="left">
-          <img :src="tableData.codeUrl " alt="">
-        </div>
+      
         <div class="title">{{tableData.compName}}</div>
         <div class="title">粮食质检单</div>
+        <div class="left">
+          <img :src="tableData.codeUrl " alt="">
+        </div>
         </div>
       
         <div class="number">{{tableData.qualityNo}}</div>

public/static/payprint.html

@@ -52,6 +52,8 @@
         width: 80px;
         height: 80px;
         position: absolute;
+        right: 20px;
+        top: 3px;
 
       }
 
@@ -72,6 +74,11 @@
         text-align: right;
         margin-bottom: 10px;
       }
+      .number1 {
+    text-align: right;
+    margin-bottom: 10px;
+    margin-top: 60px;
+}
 
       .small-row {
         display: flex;
@@ -409,11 +416,15 @@
               </div>
             </div>
             <div v-if="isShowPrintType4" class="part2">
-              <div class="leftimg">
+              <div style="height: 120px;">
+             
+                  <div class="title">入库检斤单</div>
+                  <div class="leftimg">
                     <img :src="printData1[index].weighingManagement.codeUrl" alt="">
                   </div>
-              <div class="title">入库检斤单</div>
-              <div class="number">{{printData1[index].weighingManagement.number}}</div>
+                  <div class="number1">{{printData1[index].weighingManagement.number}}</div>
+                </div>
+             
               <table class="table">
                 <tr class="row">
                   <td class="col col-bgc">客户姓名</td>
@@ -546,12 +557,9 @@
                 <img :src="customerList1[index].imgURl.imageUrl4" class="avatar" />
               </div>
             </div>
-
-
           </div>
         </div>
       </div>
-
       <div class="content" v-else>
         <div class="part5" v-if="isShowPrintType5">
           <div class="header1">
@@ -736,11 +744,14 @@
         </div>
 
         <div v-if="isShowPrintType4" class="part2">
+          <div>
+        
+          <div class="title">入库检斤单</div>
           <div class="leftimg">
             <img :src="tableData.codeUrl" alt="">
           </div>
-          <div class="title">入库检斤单</div>
-          <div class="number">{{tableData.number}}</div>
+          <div class="number1">{{tableData.number}}</div>
+        </div>
           <table class="table">
             <tr class="row">
               <td class="col col-bgc">客户姓名</td>

public/static/weightCheck.html

@@ -53,8 +53,9 @@
       img,.left{
         width: 120px;
         height: 120px;
-        /* margin-right: 118px; */
         position: absolute;
+        right: 20px;
+        top: -15px;
       }
 
       .config {
@@ -74,12 +75,13 @@
         text-align: center;
         font-size: 36px;
         font-weight: 500;
+        position: relative;
       }
 
       .number {
         text-align: right;
         margin-bottom: 10px;
-        margin-top: 20px;
+        margin-top: 30px;
       }
 
       .small-row {
@@ -131,11 +133,11 @@
       <div v-if="selectPrint">
         <div v-for="(item,index) in tableData1" :key="index">
           <div class="content" :class="pageType=='A5'?'a5-content':''">
+            <div class="title">{{item.compName}}</div>
+            <div class="title">入库检斤单</div>
             <div class="left">
               <img :src="item.codeUrl" alt="">
             </div>
-            <div class="title">{{item.compName}}</div>
-            <div class="title">入库检斤单</div>
             <div class="number">{{item.number}}</div>
             <table class="table">
               <tr class="row">
@@ -222,11 +224,12 @@
       </div>
       <div v-else>
         <div class="content" v-if="bigContent">
-         <div class="left">
-              <img :src="tableData.codeUrl" alt="">
-            </div>
+        
           <div class="title">{{tableData.compName}}</div>
           <div class="title">入库检斤单</div>
+          <div class="left">
+            <img :src="tableData.codeUrl" alt="">
+          </div>
           <div class="number">{{tableData.number}}</div>
           <table class="table">
             <tr class="row">

src/views/houseSelfCollect/inspectInfo.vue

@@ -49,12 +49,15 @@
               </el-select>
             </ws-form-item>
             <ws-form-item label="车牌号" span="1" prop="carNumber">
-              <!-- <el-select v-model="inspect.carNumber" clearable filterable  placeholder="请选择" class="typeselect" @change="shipperNameChange"
+              <!-- <el-select v-model="inspect.carNumber" clearable  @blur="selectBlur" filterable  placeholder="请选择" class="typeselect" @change="shipperNameChange"
+                :disabled="disabled1"> -->
+                
+                <el-select v-model="inspect.carNumber" clearable filterable allow-create default-first-option placeholder="请选择" class="typeselect" @change="shipperNameChange"
                 :disabled="disabled1">
                 <el-option v-for="(item,index) in carNumberList" :key="index" :label="item.carNo" :value="index" />
-              </el-select> -->
-              <ws-input @change='carnochange' v-model="inspect.carNumber" placeholder="请输入车牌号" maxlength="10" size="small"
-                :disabled="disabled" />
+              </el-select>
+              <!-- <ws-input @change='carnochange' v-model="inspect.carNumber" placeholder="请输入车牌号" maxlength="10" size="small"
+                :disabled="disabled" /> -->
             </ws-form-item>
             <ws-form-item label="箱号-1" span="1" prop="boxNo">
               <ws-input :disabled="disabled" v-model="inspect.boxNo" placeholder="请输入箱号" maxlength="20" size="small" />
@@ -350,6 +353,16 @@
         number = number.substring(number.length - 4, number.length)
         this.inspect.qualityNo = 'SGRK' + this.getdate() + this.cangNo + number //SGRK+8位时间+3位仓库编号+4位序列号
       },
+      selectBlur(e) {
+                if (e.target.value) {  
+                 // 不在表单的时候不需要判断，也不需要isname字段
+                    this.inspect.carNumber = e.target.value;
+                    // this.isName = true;   
+                } else {
+                    // this.isName = false;
+                }
+            },
+
       closeDialog() {
         html2canvas(this.$refs.saveImg.$el).then(canvas => {
           let dataURL = canvas.toDataURL('image/png');

src/views/tradeServicesManagement/warehouseReceiptAdd.vue

@@ -94,7 +94,7 @@
         </el-select>
       </el-form-item>
       <div>
-        <el-button @click='inoutput' type="primary">出入库记录</el-button>
+        <el-button @click='inoutput' type="primary" :disabled="!deptBudgetList.goodsName">出入库记录</el-button>
         <el-button @click='submit' type="primary">提交审核</el-button>
       </div>
       <!-- </ws-info-table> -->
@@ -394,10 +394,10 @@
           this.$message.error('银行不能为空！');
           return false
         }
-        if (!this.deptBudgetList.three) {
-          this.$message.error('第三方不能为空！')
-          return false
-        }
+        // if (!this.deptBudgetList.three) {
+        //   this.$message.error('第三方不能为空！')
+        //   return false
+        // }
         return true
       },
       submit() {

src/views/tradeServicesManagement/warehouseReceiptEdit.vue

@@ -175,7 +175,7 @@
         </el-select>
       </el-form-item>
       <div>
-        <el-button @click="inoutput" type="primary">出入库记录</el-button>
+        <el-button @click="inoutput" type="primary" :disabled="!deptBudgetList.goodsName">出入库记录</el-button>
         <el-button @click="submit" type="primary">重新提交</el-button>
       </div>
       <div class="title1">审核记录</div>
@@ -486,10 +486,10 @@ export default {
           this.$message.error('银行不能为空！');
           return false
         }
-        if (!this.deptBudgetList.three) {
-          this.$message.error('第三方不能为空！')
-          return false
-        }
+        // if (!this.deptBudgetList.three) {
+        //   this.$message.error('第三方不能为空！')
+        //   return false
+        // }
         return true
       },
   },

src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

@@ -58,6 +58,8 @@
             <el-button size="mini" v-hasPermission=" `tradeServicesManagement.tradeService.view`" @click="lookBtnClick(scope.row, 2)">
               查看</el-button>
             <el-button v-if="scope.row.taskId && scope.row.approveStatus=='待决策人审核'" size="mini" @click="toExamineBtnClick(scope.row, 2)">
+              审核</el-button>
+                <el-button v-if="scope.row.taskId && scope.row.approveStatus=='待第三方审核'" size="mini" @click="toExamineBtnClick(scope.row, 2)">
               审核</el-button>
             <el-button v-if="scope.row.taskId && scope.row.approveStatus=='待银行审批'" size="mini" @click="approveBtnClick(scope.row, 2)">
               审批</el-button>