前端孟祥旭

src/views/financialManagement/collectionManagementList.vue

@@ -3,6 +3,7 @@
   <div class="container">
     <!-- <div> -->
     <div>
+      
       <ws-input
         v-model="searchKeyWord"
         placeholder="可按照合同编号和任务编号进行查找"
@@ -25,6 +26,7 @@
           alt
         />
       </ws-button>
+      
     </div>
     <ws-button  @click="handleAdd()">全部</ws-button>
     <ws-button  @click="handleAdd()">待回款</ws-button>
@@ -45,19 +47,75 @@
       <el-table-column class="table_td" prop="receiveWarehouse" label="出货量(吨)"></el-table-column>
       <el-table-column class="table_td" prop="" label="已开发票(元)"></el-table-column>
       <el-table-column class="table_td" prop="" label="未开发票(元)"></el-table-column>
-      <el-table-column class="table_td" prop="" label="状态"></el-table-column>
+      <el-table-column class="table_td" prop="" label="状态">
+        <template slot-scope="scope">
+          <el-popover
+            placement="left"
+            :width="285"
+            trigger="click"
+            visible-arrow="false"
+            @show="history(scope.row)"
+          >
+            <template>
+              <span slot="reference">
+                <span
+                  v-if="scope.row.status == '待执行'"
+                  class="executory"
+                ></span>
+                <span
+                  v-if="scope.row.status == '执行中'"
+                  class="inExecution"
+                ></span>
+                <span v-if="scope.row.status == '已完成'" class="done"></span
+                >{{ scope.row.status }}
+              </span>
+            </template>
+            <div>
+              <p style="margin-top: 0; padding-left: 10px">操作历史</p>
+              <div
+                v-for="(item, index) in historyList"
+                :key="index"
+                class="flex"
+              >
+                <div class="vertical-text vertical-text-left">
+                  {{ item.updateDate }}
+                </div>
+                <div>
+                  <div class="vertical-circle"></div>
+                  <div
+                    v-if="index != historyList.length - 1"
+                    class="vertical-line"
+                  ></div>
+                </div>
+                <div class="vertical-text">
+                  {{ item.operateUser }}<br />{{ item.dealMsg }}
+                </div>
+              </div>
+            </div>
+          </el-popover>
+          <img
+            width="17"
+            height="18"
+            style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/edit.png"
+            @click="editClick(scope.row)"
+            alt=""
+          />
+          <!-- <i class="el-icon-edit" @click="editClick(scope.row)"></i> -->
+        </template>
+      </el-table-column>
       <el-table-column class="table_td" prop="" label="更新时间"></el-table-column>
       <el-table-column prop="seller" label="操作" >
         <template slot-scope="scope">
           <div class="record" @click="dialogFormVisible2=true">派发</div>
-            <el-dialog
-            width="40%"
+             <el-dialog
+            width="60%"
             title="派发(123)"
             :visible.sync="dialogFormVisible2"
             :append-to-body="true"
           >
-            <el-form :model="form">
-              <el-form-item label="默认库管" :label-width="formLabelWidth">
+            <el-form :model="form" >
+                  <el-form-item label="默认库管" :label-width="formLabelWidth">
                 <el-select
                   v-model="form.region"
                   autocomplete="off"
@@ -65,7 +123,82 @@
                   class="deal"
                 ></el-select>
               </el-form-item>
-             
+              <el-form-item label="编号" :label-width="formLabelWidth">
+               
+              </el-form-item>
+              <el-form-item label="车牌号" :label-width="formLabelWidth" class="car">
+               <el-input
+                  v-model="form.region"
+                  autocomplete="off"
+                  placeholder="请输入车牌号"
+                  class="deall"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="箱号" :label-width="formLabelWidth" class="boxno">
+                <el-input
+                  v-model="form.region"
+                  autocomplete="off"
+                  placeholder="请输入箱号"
+                  class="dealll"
+                ></el-input>
+              </el-form-item>
+               <el-form-item label="封号" :label-width="formLabelWidth" class="fengno">
+                <el-input
+                  v-model="form.region"
+                  autocomplete="off"
+                  placeholder="请输入封号"
+                  class="dea"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="库管" :label-width="formLabelWidth" class="kug">
+                <el-input
+                  v-model="form.region"
+                  autocomplete="off"
+                  placeholder=""
+                  class="deaa"
+                ></el-input>
+              </el-form-item>
+              <el-button class="bot" @click="add()">新增</el-button>
+              <hr>
+              <!-- <el-form v-for="(item , index) in lists" :Key="index">
+              <el-form-item label="编号" :label-width="formLabelWidth">
+               
+              </el-form-item>
+              <el-form-item label="车牌号" :label-width="formLabelWidth" class="car">
+               <el-input
+                  v-model="form.region"
+                  autocomplete="off"
+                  placeholder="请输入车牌号"
+                  class="deall"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="箱号" :label-width="formLabelWidth" class="boxno">
+                <el-input
+                  v-model="form.region"
+                  autocomplete="off"
+                  placeholder="请输入箱号"
+                  class="dealll"
+                ></el-input>
+              </el-form-item>
+               <el-form-item label="封号" :label-width="formLabelWidth" class="fengno">
+                <el-input
+                  v-model="form.region"
+                  autocomplete="off"
+                  placeholder="请输入封号"
+                  class="dea"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="库管" :label-width="formLabelWidth" class="kug">
+                <el-input
+                  v-model="form.region"
+                  autocomplete="off"
+                  placeholder=""
+                  class="deaa"
+                ></el-input>
+              </el-form-item>
+              <el-button class="bot" @click="add()">删除</el-button>
+              <hr>
+            </el-form> -->
             </el-form>
           </el-dialog>
         </template>
@@ -186,7 +319,13 @@ export default {
       this.searchType = state
       this.getList()
     },
-    
+    add() {
+      this.freightspace.push({
+        // binNumber: '',
+        // maxStorage: '',
+        // remark: '',
+      })
+    },
     //编辑
     handleEdit(row) {
       this.$router.push({
@@ -225,6 +364,36 @@ export default {
         }
       })
     },
+    editClick(row) {
+      var status = ''
+      if (row.status == '待回款' || row.status == '已回款') {
+        status = '执行中'
+      } else if (row.status == '执行中') {
+        status = '已完成'
+      }
+      this.$confirm(`是否将状态改为${status}`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          editstatus({ id: row.id })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '状态修改成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
     //添加
     // handleAdd(){
     //   this.$router.push({
@@ -381,6 +550,7 @@ export default {
           this.historyList = response
         })
     },
+    
     //查找
     find() {
       this.currentPage = 1
@@ -622,4 +792,45 @@ export default {
 .el-table .el-table__body .cell {
   text-align: center;
 }
+.deall {
+    margin-top: 6%;
+    margin-left: -9%;
+    width: 120px;
+}
+.car{
+  margin-top: -57px;
+}
+.boxno {
+    margin-top: -188px;
+    margin-left: 25%;
+}
+.dealll{
+  margin-top: 17.6%;
+  margin-left: -13.2%;
+  width: 120px;
+}
+.fengno {
+    margin-top: -18%;
+    margin-left: 31%;
+}
+ .dea {
+    margin-top: 22%;
+    margin-left: -9.2%;
+    width: 120px;
+}
+.kug[data-v-8b5eee48] {
+    /* margin-top: -14%; */
+    margin-left: 50%;
+    width: 120px;
+    margin-top: -121px;
+}
+.deaa {
+   width: 120px;
+    margin-top: 62px;
+    margin-left: -66px;
+}
+.bot{
+  margin-left: 76%;
+  margin-top: -7px;
+}
 </style>

vue.config.js

@@ -145,7 +145,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.121:8090/',
+        target: 'http://192.168.1.116:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',