Jelajahi Sumber

Merge tag 'Hotfix-zh-269' into develop

Finish Hotfix-zh-269
howie 2 tahun lalu
induk
melakukan
c673e0ed88

+ 1 - 0
src/views/deposit_commerce/components/deposit_list-detail.vue

@@ -466,6 +466,7 @@
       </div>
       <div style="margin: 20px 0">
         <el-button
+        v-if="details.examineStatus != 'OK' || (!isCustomer && details.examineStatus == 'OK')"
           type="primary"
           size="small"
           @click="handleSvse"

+ 1 - 1
src/views/deposit_commerce/deposit_list.vue

@@ -235,7 +235,7 @@
 
               </template>
             <el-col :xs="24" :sm="24" :lg="24">
-    <div class="fl">
+    <div class="fl" v-if="!isCustomer">
           <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
             <el-radio-button label="TRADE">家用工程</el-radio-button>
             <el-radio-button label="TRADE">商用工程</el-radio-button>

+ 2 - 1
src/views/deposit_home/deposit_list.vue

@@ -226,7 +226,8 @@
 
             </template>
             <el-col :xs="24" :sm="24" :lg="24">
-              <div class="fl">
+              <div class="fl" v-if="!isCustomer">
+
                 <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
                   <el-radio-button label="HOME">家用工程</el-radio-button>
                   <el-radio-button label="TRADE">商用工程</el-radio-button>

+ 2 - 1
src/views/supply/engin/components/home_detail.vue

@@ -286,7 +286,8 @@
           <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.realDirectTransferQty " size="small" type="number"></el-input>
+              <el-input v-model="scope.row.realDirectTransferQty "   :disabled="!scope.row.isDirectTransfer"
+ size="small" type="number"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>