Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/components/ButtonBar/index.vue

@@ -96,6 +96,9 @@ export default {
     },
     btnHandle(btnKey) {
       this.$emit('btnhandle', btnKey)
+    },
+    setButtonList(value) {
+      this.btnList = value
     }
   }
 }

anrui-scm/anrui-scm-ui/src/views/anruiscm/scmmaterial/scmmaterial.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container-Update">
     <div v-show="viewState == 1">
-      <button-bar view-title="物料管理" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <button-bar ref="btnbar" view-title="物料管理" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
       <div class="searchcon">
         <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
         </el-button>
@@ -185,7 +185,51 @@ export default {
           manufacturerSid: ''
         }
       },
-      multipleSelection: []
+      multipleSelection: [],
+      btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'el-icon-plus',
+          btnKey: 'toAdd',
+          btnLabel: '新增'
+        },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: 'el-icon-edit',
+          btnKey: 'toEdit',
+          btnLabel: '编辑'
+        },
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'el-icon-delete',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'success',
+          size: 'small',
+          icon: '',
+          btnKey: 'doImport',
+          btnLabel: '导入'
+        },
+        {
+          type: 'success',
+          size: 'small',
+          icon: '',
+          btnKey: 'doExport',
+          btnLabel: '导出'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: '',
+          btnKey: 'colse',
+          btnLabel: '关闭'
+        }
+      ]
     }
   },
   created() {
@@ -196,6 +240,9 @@ export default {
     this.unit()
     this.manufacturer()
   },
+  mounted() {
+    this.$refs["btnbar"].setButtonList(this.btnList);
+  },
   methods: {
     mGroup() {
       req.pullDown({ psid: 0, type: 'materialGroup' }).then((response) => {

anrui-scm/anrui-scm-ui/src/views/anruiscm/scmmaterial/scmmaterialInfo.vue

@@ -6,7 +6,7 @@
       <div>物料信息</div>
       <!--start 详情按钮-->
       <div>
-        <el-button itype="info" size="small" @click="handleReturn()">返回</el-button>
+        <el-button itype="info" size="small" @click="handleReturn()">关闭</el-button>
       </div>
       <!--end 详情按钮-->
     </div>
@@ -14,59 +14,57 @@
     <div class="listconadd">
       <el-form
         ref="dataForm"
-        label-position="right"
-        label-width="190px"
-        class="forminfo">
+        class="formadd">
         <div class="wlInfo"><span>物料信息</span></div>
         <el-row>
-          <el-col :span="4" class="trightb">物料编码</el-col>
-          <el-col :span="8" class="tleftb">{{ formobj.mNum }}</el-col>
-          <el-col :span="4" class="trightb">物料名称</el-col>
-          <el-col :span="8" class="tleftb">{{ formobj.mName }}</el-col>
+          <el-col :span="4" class="tleftb">物料编码</el-col>
+          <el-col :span="8" class="trightb">{{ formobj.mNum }}</el-col>
+          <el-col :span="4" class="tleftb">物料名称</el-col>
+          <el-col :span="8" class="trightb">{{ formobj.mName }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">物料简称</el-col>
-          <el-col :span="8" class="tleftb">{{ formobj.mAbbreviation }}</el-col>
-          <el-col :span="4" class="trightb">物料分组</el-col>
-          <el-col :span="8" class="tleftb">{{ formobj.mGroup }}</el-col>
+          <el-col :span="4" class="tleftb">物料简称</el-col>
+          <el-col :span="8" class="trightb">{{ formobj.mAbbreviation }}</el-col>
+          <el-col :span="4" class="tleftb">物料分组</el-col>
+          <el-col :span="8" class="trightb">{{ formobj.mGroup }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">规格型号</el-col>
-          <el-col :span="8" class="tleftb">{{ formobj.model }}</el-col>
-          <el-col :span="4" class="trightb">基本单位</el-col>
-          <el-col :span="8" class="tleftb">{{ formobj.unit }}</el-col>
+          <el-col :span="4" class="tleftb">规格型号</el-col>
+          <el-col :span="8" class="trightb">{{ formobj.model }}</el-col>
+          <el-col :span="4" class="tleftb">基本单位</el-col>
+          <el-col :span="8" class="trightb">{{ formobj.unit }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">物料属性</el-col>
-          <el-col :span="8" class="tleftb">{{ formobj.mAttribute }}</el-col>
-          <el-col :span="4" class="trightb">存货类别</el-col>
-          <el-col :span="8" class="tleftb">{{ formobj.inventoryType }}</el-col>
+          <el-col :span="4" class="tleftb">物料属性</el-col>
+          <el-col :span="8" class="trightb">{{ formobj.mAttribute }}</el-col>
+          <el-col :span="4" class="tleftb">存货类别</el-col>
+          <el-col :span="8" class="trightb">{{ formobj.inventoryType }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">存放地点</el-col>
-          <el-col :span="8" class="tleftb">{{ formobj.storageLocation }}</el-col>
-          <el-col :span="4" class="trightb">入库时间</el-col>
-          <el-col :span="8" class="tleftb">{{ formobj.warehousingTime }}</el-col>
+          <el-col :span="4" class="tleftb">存放地点</el-col>
+          <el-col :span="8" class="trightb">{{ formobj.storageLocation }}</el-col>
+          <el-col :span="4" class="tleftb">入库时间</el-col>
+          <el-col :span="8" class="trightb">{{ formobj.warehousingTime }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">生产厂家</el-col>
-          <el-col :span="20" class="tleftb">{{ formobj.manufacturer }}</el-col>
+          <el-col :span="4" class="tleftb">生产厂家</el-col>
+          <el-col :span="20" class="trightb">{{ formobj.manufacturer }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">描述</el-col>
-          <el-col :span="20" class="tleftb">{{ formobj.remarks }}</el-col>
+          <el-col :span="4" class="tleftb">描述</el-col>
+          <el-col :span="20" class="trightb">{{ formobj.remarks }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">数据状态</el-col>
-          <el-col :span="8" class="tleftb">{{ formobj.state == "0" ? '已审核' : '未审核' }}</el-col>
-          <el-col :span="4" class="trightb">禁用状态</el-col>
-          <el-col :span="8" class="tleftb">{{ formobj.isEnable == "0" ? '可用' : '不可用' }}</el-col>
+          <el-col :span="4" class="tleftb">数据状态</el-col>
+          <el-col :span="8" class="trightb">{{ formobj.state == "0" ? '已审核' : '未审核' }}</el-col>
+          <el-col :span="4" class="tleftb">禁用状态</el-col>
+          <el-col :span="8" class="trightb">{{ formobj.isEnable == "0" ? '可用' : '不可用' }}</el-col>
         </el-row>
         <el-row>
-          <el-col :span="4" class="trightb">创建组织</el-col>
-          <el-col :span="8" class="tleftb">{{ formobj.createOrg }}</el-col>
-          <el-col :span="4" class="trightb">使用组织</el-col>
-          <el-col :span="8" class="tleftb">{{ formobj.useOrg }}</el-col>
+          <el-col :span="4" class="tleftb">创建组织</el-col>
+          <el-col :span="8" class="trightb">{{ formobj.createOrg }}</el-col>
+          <el-col :span="4" class="tleftb">使用组织</el-col>
+          <el-col :span="8" class="trightb">{{ formobj.useOrg }}</el-col>
         </el-row>
       </el-form>
     </div>
@@ -94,7 +92,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .headInfo {
   margin-left: -14px;
   margin-right: -14px;
@@ -118,13 +116,26 @@ export default {
   padding: 0px;
 }
 
+/*.tleftb {*/
+/*  text-align: left;*/
+/*}*/
 .tleftb {
-  text-align: left;
+  text-align: right;
+  border-left: 1px solid #e0e3eb;
 }
-
 .tab-headerg {
   height: 35px;
   background-color: #EDF1F7;
   padding: 20px 20px;
 }
+/deep/ .el-col-8 {
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px !important;
+}
+/deep/ .el-col-20 {
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px !important;
+}
 </style>

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/changyongpeizhi.vue

@@ -7,7 +7,7 @@
         <div>
           <el-button type="primary" size="small" @click="handleCreate()">新增配置</el-button>
           <el-button type="primary" size="small" @click="handleConfirm()">确认</el-button>
-          <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
       <div class="searchcon">

anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue

@@ -6,7 +6,7 @@
         <div>
           <el-button type="primary" size="small" @click="handleGuanlian()">关联</el-button>
           <el-button type="danger" size="small" @click="handleDelete()">解除</el-button>
-          <el-button type="info" size="small" @click="handleReturn()">返回</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
       </div>
       <div class="searchcon">