Merge branch 'dev' into 'purchaseDev'

Dev

See merge request new-business/drp-web!361

src/views/business/spd/bo/basic/details.vue

@@ -10,7 +10,7 @@
       </el-col>
       <el-col :span="16">
         <div class="grid-content bg-purple-light">
-          <el-descriptions :colon="false" :size="medium">
+          <el-descriptions :colon="false" size="medium">
             <el-descriptions-item>
               <dev style="width: 200px; height: 60px; font-size: 18px" v-show="!showCustomer">
                 {{ form.basic.boName.split('-')[0] + '-' + form.basic.boName.split('-')[1].substring(0, 2) + '******' +

src/views/business/spd/bo/basic/index.vue

@@ -322,7 +322,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="客户名称" prop="customerName">
-              <el-input
+              <dr-popover-select 
+                  :disabled="this.operatingState == 'Update'"
+                  v-model="form.customerName" title="客户" type="CUSTOMER_PARAM_ZT" :dataMapping="{
+                  customer: 'id',
+                  customerName: 'name',
+                }" :source.sync="form">
+              </dr-popover-select>
+              <!-- <el-input
                 v-model="form.customerName"
                 :disabled="this.operatingState == 'Update'"
               >
@@ -332,7 +339,7 @@
                   @click="refereCustomer"
                   :disabled="this.operatingState == 'Update'"
                 ></el-button>
-              </el-input>
+              </el-input> -->
             </el-form-item>
           </el-col>
           <el-col :span="8">

src/views/business/spd/bo/behavior/index.vue

@@ -248,8 +248,8 @@
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-if="this.operatingState != 'Browse'" :disabled="submitButtonEditStatus">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button size="mini" type="primary" @click="submitForm" v-if="this.operatingState != 'Browse'" :disabled="submitButtonEditStatus">确 定</el-button>
+        <el-button size="mini" @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/business/spd/bo/contact/index.vue

@@ -363,8 +363,8 @@
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-if="this.operatingState != 'Browse'" :disabled="submitButtonEditStatus">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button size="mini" type="primary" @click="submitForm" v-if="this.operatingState != 'Browse'" :disabled="submitButtonEditStatus">确 定</el-button>
+        <el-button size="mini" @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>

src/views/purchase/transferOrder/add.vue

@@ -1752,7 +1752,7 @@ export default {
             for(let key in obj) {
               jiaoyan.push(obj[key][0].message);
             }
-            this.$modal.notifyWarning(jiaoyan[0]);
+            this.$modal.notifyWarning(jiaoyan + "！");
             return false;
           }
       });