Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0

src/styles/index.scss

@@ -243,3 +243,34 @@ h3 {
   font-weight:bold;
   color: black;
 }
+//生成
+.el-button--shengcheng{
+  background: #ffffff;
+  border-color: rgb(255,151,89);
+  color: rgb(255,151,89);
+  &:hover{
+    background: #67C23A;
+    border-color: #67C23A;
+    color: white;
+  }
+  &:focus{
+    background: #67C23A;
+    border-color: #67C23A;
+    color: white;
+  }
+}
+.el-button--baocun.is-disabled{
+  background:	LightGreen;
+  border-color:	LightGreen;
+  color: white;
+  &:hover{
+    background:	LightGreen;
+    border-color:	LightGreen;
+    color: white;
+  }
+  &:focus{
+    background:	LightGreen;
+    border-color: LightGreen;
+    color: white;
+  }
+}

src/views/Inventory/InventoryManagement/index.vue

@@ -49,7 +49,7 @@
               plain
               icon="el-icon-delete"
               @click="handleDelete(scope.row)">删除</el-button>
-            <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADDLocate()">新增货位</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADDLocate()">增加货位</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -91,13 +91,11 @@
             <el-button
               size="mini"
               icon="el-icon-edit"
-              plain
-              type="warning"
+              type="primary"
               @click="handleLocateEdit(scope.row)">修改</el-button>
             <el-button
               size="mini"
               type="danger"
-              plain
               icon="el-icon-delete"
               @click="locateDelete(scope.row)">删除</el-button>
           </template>

src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue

@@ -59,7 +59,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="120" fixed="right">
           <template slot-scope="scope">
-            <el-tooltip effect="dark" content="将滞货与项目关联并使用" placement="top" open-delay="1200">
+            <el-tooltip :open-delay="1000" effect="dark" content="将滞货与项目关联并使用" placement="top">
               <el-button :disabled="Number(scope.row.是否关联)===1" size="mini" type="warning" plain @click="connectBacklog(scope.row)">关联物料</el-button>
             </el-tooltip>
           </template>
@@ -111,7 +111,7 @@
       </el-table>
     </el-card>
 
-    <el-dialog :visible.sync="dialogVisible1" title="关联物料" center style="min-height: 300px;" width="900px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible1" title="关联物料" center style="min-height: 300px;" width="900px">
       <el-table :data="tableData01" size="mini" border style="width: 100%;" height="220" show-summary @selection-change="handleSelectionChange">
         <el-table-column type="selection" align="center" width="55"/>
         <el-table-column label="名称" align="center" min-width="100">
@@ -184,7 +184,7 @@ export default {
     ])
   },
   mounted() {
-    this.initData()
+    // this.initData()
     this.searchTable1()
   },
   methods: {
@@ -249,7 +249,6 @@ export default {
       }
       if (sum === Number(this.useNumber)) {
         submitConnectBacklog(this.useNum, materialLocalGroup, numGroup).then(response => {
-          console.log(response.data)
           if (response.data[0].result === '1') {
             this.$message.success('关联成功')
             this.searchTable1()

src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue

@@ -189,12 +189,12 @@
       <el-button
         type="primary"
         size="small"
-        icon=""
+        plain
         style="margin-left: 7.5%; margin-top: 10px"
         @click="doneContract">生成采购合同</el-button>
     </el-card>
 
-    <el-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px">
       <el-form ref="form1" :model="form1" label-position="left" label-width="90px" class="searchForm">
         <el-row>
           <el-col :span="12">