Merge branch 'dev' into 'master'

Dev to Master 李园修改

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

src/views/material/basicFile/details.vue

@@ -241,7 +241,7 @@
                     <template slot-scope="scope">
                       {{ m.attribute == 'select' ? scope.row[`${m.prop}Name`] :
                         (m.attribute == 'checkbox' ?
-                          (scope.row[m.prop] == '0' ? '是' : '否')
+                          (scope.row[m.prop] == '0' ? '√' : '')
                           : scope.row[m.prop])
                       }}
                     </template>
@@ -333,7 +333,7 @@
                         <template slot-scope="scope">
                           {{ v.attribute == 'select' ? scope.row[`${v.prop}Name`] :
                             (v.attribute == 'checkbox' ?
-                              (scope.row[v.prop] == '0' ? '是' : '否')
+                              (scope.row[v.prop] == '0' ? '√' : '')
                               : scope.row[v.prop])
                           }}
                         </template>
@@ -349,7 +349,7 @@
                         <template slot-scope="scope">
                           {{ v.attribute == 'select' ? scope.row[`${v.prop}Name`] :
                             (v.attribute == 'checkbox' ?
-                              (scope.row[v.prop] == '0' ? '是' : '否')
+                              (scope.row[v.prop] == '0' ? '√' : '')
                               : scope.row[v.prop])
                           }}
                         </template>
@@ -1777,10 +1777,9 @@ export default {
       } else if (this.MoreDataDialog.target.name == 'materialType') {
 
         // 物料类别
-
         console.log('确认时选择的数据', this.MoreDataDialog.value);
 
-        this.materialType.value = this.materialType.value.map(m => {
+        this.materialType.value = this.materialType.value.map(m => { 
           if ((m.id && m.id != '' && m.id == _this.MoreDataDialog.target.prop['id']) ||
             (m.insertId && m.insertId == _this.MoreDataDialog.target.prop['insertId'])
           ) {