Merge remote-tracking branch 'origin/dev-cq-bug' into dev-cq-bug

sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue

@@ -543,6 +543,8 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.unitId = ''
+      this.queryParams.lotId  = ''
       this.resetForm('queryForm')
       this.handleQuery()
     },

sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue

@@ -415,6 +415,8 @@
             /** 重置按钮操作 */
             resetQuery() {
                 this.queryParams.time = []
+                this.queryParams.unitId = ''
+                this.queryParams.proId  = ''
                 this.resetForm('queryForm')
                 this.GetUnitData()
                 this.GetProData()

sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue

@@ -431,6 +431,8 @@
             /** 重置按钮操作 */
             resetQuery() {
                 this.queryParams.time = []
+                this.queryParams.unitId = ''
+                this.queryParams.proId  = ''
                 this.resetForm('queryForm')
                 this.GetUnitData()
                 this.GetProData()

sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue

@@ -126,7 +126,7 @@
             size="mini"
             type="primary"
             @click="handleNumReturn(scope.row)"
-            v-if="!isView&&(scope.row.manageType=='1'||'2')&&scope.row.num>0"
+            v-if="!isView&&(scope.row.manageType=='1'||scope.row.manageType=='2')&&scope.row.num>0"
           >数量退料</el-button>
           <el-button
             size="mini"

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue

@@ -227,7 +227,6 @@
             :autosize="{ minRows: 4, maxRows: 6}"
             placeholder="请输入通知内容"
             style="width: 80%;"
-            disabled
           />
         </el-form-item>
       </el-form>

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue

@@ -290,7 +290,7 @@
                         "
           >入库单</div>
           <div class="info" style="margin-top: 10px; display: flex; flex-wrap: wrap">
-            <div
+            <!-- <div
               class="item"
               style="
                                 width: 50%;
@@ -300,7 +300,7 @@
                             "
             >
               <span>工程名称：</span>
-            </div>
+            </div> -->
             <div
               class="item"
               style="
@@ -312,7 +312,7 @@
             >
               <span>日期：</span>
             </div>
-            <div
+            <!-- <div
               class="item"
               style="
                                 width: 50%;
@@ -322,8 +322,8 @@
                             "
             >
               <span>领料单号</span>
-            </div>
-            <div
+            </div> -->
+            <!-- <div
               class="item"
               style="
                                 width: 50%;
@@ -333,7 +333,7 @@
                             "
             >
               <span>车辆信息：</span>
-            </div>
+            </div> -->
           </div>
           <el-table
             :data="printTableData"