Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/logistics/details/tabs/logisticsBox/add.vue

@@ -31,6 +31,12 @@
                 <div v-if="scope.column.columnname === 'nominalpressure'" >
                   {{tool.nominalPressureSet(scope.column.data[scope.column.columnname])}}
                 </div>
+                <div v-else-if="scope.column.columnname === 'qty'">
+                  <el-input v-model.number="scope.column.data[scope.column.columnname]" type="number" size="mini"></el-input>
+                </div>
+                <div v-else-if="scope.column.columnname === 'remarks'">
+                  <el-input v-model="scope.column.data[scope.column.columnname]" size="mini"></el-input>
+                </div>
                 <div v-else>{{scope.column.data[scope.column.columnname]||scope.column.columnname ==='operation'?scope.column.data[scope.column.columnname] : '--'}}</div>
               </template>
               <template v-slot:opreation="scope">

src/HDrpManagement/logistics/details/tabs/logisticsBox/edit.vue

@@ -31,6 +31,12 @@
                 <div v-if="scope.column.columnname === 'nominalpressure'" >
                   {{tool.nominalPressureSet(scope.column.data[scope.column.columnname])}}
                 </div>
+                <div v-else-if="scope.column.columnname === 'qty'">
+                  <el-input v-model.number="scope.column.data[scope.column.columnname]" type="number" size="mini"></el-input>
+                </div>
+                <div v-else-if="scope.column.columnname === 'remarks'">
+                  <el-input v-model="scope.column.data[scope.column.columnname]" size="mini"></el-input>
+                </div>
                 <div v-else>{{scope.column.data[scope.column.columnname]||scope.column.columnname ==='operation'?scope.column.data[scope.column.columnname] : '--'}}</div>
               </template>
               <template v-slot:opreation="scope">

src/HDrpManagement/orderManage/details/index.vue

@@ -20,7 +20,7 @@
           <Edit style="display: inline-block !important;margin-left: -10px"   v-if="mainData.status === '新建'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />
 <!--          <Edit class="inline-16" v-if="mainData.status !== '新建' && mainData.status !== '关闭'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />-->
           <EditRemark style="margin-right: 20px !important;" v-if="mainData.status === '新建'" :data="mainData" @onSuccess="queryMainData"></EditRemark>
-          <EditRemark style="margin-right: 20px !important;margin-left: -10px" v-if="mainData.status !== '新建'" :data="mainData" @onSuccess="queryMainData"></EditRemark>
+          <EditRemark style="margin-right: 20px !important;margin-left: -10px" v-if="mainData.status !== '新建' && tool.checkAuth($route.name,'editRemark')" :data="mainData" @onSuccess="queryMainData"></EditRemark>
           <changeSaler class="inline-16" style="margin-left: -10px" ref="saler" @selectRow="salerChange" :isPlain="true">
             <el-button v-if="tool.checkAuth($route.name,'changeSaler')" type="primary" slot="input" size="mini" @click="$refs.saler.visible=true;$refs.saler.listData()">{{$t(`变更业务员`)}}</el-button>
           </changeSaler>