Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

src/utils/request.js

@@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.103:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 

src/views/BasicData/PersonnelManagement/index.vue

@@ -211,7 +211,7 @@
     </el-row>
 
     <!--新增和编辑部门-->
-    <el-dialog :title="department_Title" :visible.sync="department_DFV" center style="min-height: 200px" width="400px">
+    <el-dialog v-el-drag-dialog :title="department_Title" :visible.sync="department_DFV" center style="min-height: 200px" width="400px">
       <el-form ref="department_Form" :model="department_Form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-form-item label="部门名称" prop="DepartmentName">
           <el-input v-model="department_Form.DepartmentName" size="small" style="width:200px"/>
@@ -224,7 +224,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :title="people_title" :visible.sync="people_DFV" center style="min-height: 200px" width="800px">
+    <el-dialog v-el-drag-dialog :title="people_title" :visible.sync="people_DFV" center style="min-height: 200px" width="800px">
       <el-form ref="people_form" :rules="rules" :model="people_form" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
@@ -327,7 +327,7 @@
     </el-dialog>
 
     <!--离职名单-->
-    <el-dialog :visible.sync="LeavingListVisiable" title="离职名单" center style="height: 800px" width="80%">
+    <el-dialog v-el-drag-dialog :visible.sync="LeavingListVisiable" title="离职名单" center style="height: 800px" width="80%">
       <el-table
         :data="LeavingList"
         stripe
@@ -414,7 +414,7 @@
           @current-change="handleCurrentChangeN"/>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="dialogFormVisible" title="上传图片" center style="height: 800px" width="30%">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="上传图片" center style="height: 800px" width="30%">
       <el-upload
         id="invoiceScan"
         ref="upload"

src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue

@@ -24,11 +24,11 @@
         </el-row>
         <el-row>
           <h3 style="display: inline-block;margin: 0">签订日期:</h3>
-          <el-date-picker v-model="time_SignStart" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="签订日期" class="time"/> ~
+          <el-date-picker v-model="time_SignStart" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 150px" placeholder="签订日期" class="time"/> ~
-          <el-date-picker v-model="time_SignFinish" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="签订日期" class="time"/>
+          <el-date-picker v-model="time_SignFinish" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 150px" placeholder="签订日期" class="time"/>
           <h3 style="display: inline-block;margin: 0 0 0 20px">交货期:</h3>
-          <el-date-picker v-model="time_deliveryStart" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="交货期" class="time"/> ~
+          <el-date-picker v-model="time_deliveryStart" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 150px" placeholder="交货期" class="time"/> ~
-          <el-date-picker v-model="time_deliveryFinish" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="交货期" class="time"/>
+          <el-date-picker v-model="time_deliveryFinish" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 150px" placeholder="交货期" class="time"/>
           <span>提前</span>
           <el-input-number v-model="warningValue" :min="1" controls-position="right" size="small" style="width: 90px"/>
           <span>天预警</span>

src/views/PurchasingCenter/ProjectTotalSearch/index.vue

@@ -206,4 +206,7 @@ export default {
   .el-date-editor{
     width:300px
   }
+  .el-table__footer-wrapper {
+    height: 500px;
+  }
 </style>

src/views/PurchasingCenter/PurchaseContractReview/index.vue

@@ -123,8 +123,8 @@
 
     <div style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="returns"/>
 
-    <el-dialog :visible.sync="dialogFormVisible" title="通知" center style="min-height: 300px;" width="370px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="合同审批通知" center style="min-height: 300px;" width="370px">
-      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
+      <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px" class="demo-ruleForm">
         <el-form-item label="接收人" prop="接收人" center>
           <el-select v-model="form.接收人" size="small">
             <el-option

src/views/PurchasingCenter/SetPayPlan/index.vue

@@ -34,9 +34,9 @@
         size="mini"
         @row-click="searchContract"
         @expand-change="searchPlan">
-        <el-table-column type="expand">
+        <el-table-column label="详情" type="expand">
           <template slot-scope="props">
-            <el-table v-loading="" v-show="tableData01.length!==0" :data="tableData01" border size="mini">
+            <el-table v-show="tableData01.length!==0" :data="tableData01" class="subTableHeader" border size="mini" style="width: 450px">
               <el-table-column label="序号" align="center" type="index"/>
               <el-table-column label="计划付款日期" align="center">
                 <template slot-scope="scope">
@@ -55,7 +55,16 @@
               </el-table-column>
               <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
-                  <el-button type="danger" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+                  <el-tooltip effect="dark" content="删除" placement="top">
+                    <div style="display: inline-block">
+                      <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        @click.stop="handleDelete(scope.row)"/>
+                    </div>
+                  </el-tooltip>
+                  <!--<el-button type="danger" size="mini" plain icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>-->
                 </template>
               </el-table-column>
             </el-table>
@@ -292,4 +301,19 @@ export default {
   .el-tag{
     margin: 0
   }
+  .subTableHeader {
+  th {
+    background: #8ff4ea !important;
+    color: black;
+  }
+
+  tr.el-table__row td {
+    background-color: #d8e5f6 !important;
+  }
+
+  tr.el-table__row.el-table__row--striped td {
+    background: #e9f0f9 !important;
+  }
+  }
+
 </style>

src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue

@@ -10,7 +10,7 @@
     <el-card>
       <h4 style="margin-top: 5px">发票结算申请单</h4>
       <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%;" height="350px" size="mini" @row-click="searchTable2">
-        <el-table-column type="expand">
+        <el-table-column label="详情" type="expand">
           <template slot-scope="scope">
             <el-form label-position="left" inline class="demo-table-expand">
               <el-row>
@@ -97,11 +97,11 @@
             {{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="300">
+        <el-table-column label="操作" align="center" width="300" fixed="right">
           <template slot-scope="scope">
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="primary" icon="el-icon-edit" size="mini" style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="warning" plain icon="el-icon-edit" size="mini" style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="danger" icon="el-icon-delete" size="mini" style="margin-left:10px" @click="handleDelete(scope.row)">删除</el-button>
+            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="danger" plain icon="el-icon-delete" size="mini" style="margin-left:10px" @click="handleDelete(scope.row)">删除</el-button>
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="primary" size="mini" style="margin-left:10px" @click="submitApply(scope.row)">提交申请</el-button>
+            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="warning" plain size="mini" style="margin-left:10px" @click="submitApply(scope.row)">提交申请</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue

@@ -125,7 +125,7 @@
       </div>
     </el-card>
 
-    <el-dialog :visible.sync="dialogVisible2" title="离线合同请款" center style="min-height: 300px" width="1200px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="离线合同请款" center style="min-height: 300px" width="1200px">
       <span>供应商：</span>
       <el-select v-model="supplierValue" placeholder="供应商" filterable clearable size="small">
         <el-option