Merge tag 'Hotfix-zh-66' into develop

Finish Hotfix-zh-66

src/views/basic_data/material/components/modify_list-apply.vue

@@ -630,7 +630,7 @@
                     :key="item.bool"
                     :value="item.bool"
                     :label="item.value"
-                  />
+                  />  
                 </el-select>
               </el-form-item>
             </template>

src/views/basic_data/material/modify_list.vue

@@ -400,7 +400,7 @@
               <template slot-scope="scope">
                 <template v-if="scope.row.examineStatus == 'SAVE'">
                   <el-popconfirm
-                    title="这是一段内容确定删除吗？"
+                    title="确定提审吗？"
                     @onConfirm="handleGetPriceSubmit(scope.row.updPriceBillId)"
                     style="margin-right: 10px"
                   >

src/views/sales_policy/policy_list.vue

@@ -172,7 +172,6 @@
               @click="(isShow = 5), (id = scope.row.id)"
             >编辑</el-button>
             <el-button
-              v-if="scope.row.examineStatus !== 'OK'"
             type="text"
               size="small"
               @click="

src/views/supply/policy/components/retail_detail.vue

@@ -39,7 +39,7 @@
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">业务员</div>
-            <div class="value">{{ detailData.serviceName }}</div>
+            <div class="value">{{ detailData.k3ServiceName }}</div>
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">制单人</div>