Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/contractManagement/purchaseContract.vue

@@ -59,62 +59,73 @@
         </template>
       </el-table-column> -->
       <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
-      <el-table-column prop="unitContractPrice" label="合同单价（元）">
+      <el-table-column width='130' prop="unitContractPrice" label="合同单价（元）">
       </el-table-column>
       <!-- <el-table-column prop="packingMethod" label="包装方式"> </el-table-column> -->
       <el-table-column prop="buyer" label="买方"> </el-table-column>
       <el-table-column prop="seller" label="卖方"> </el-table-column>
-      <el-table-column prop="completedQuantity" label="已完成（吨）">
+      <el-table-column width='120' prop="completedQuantity" label="已完成（吨）">
         <template slot-scope="scope">
           <span style="color: #5473e8; font-weight: 600">{{
             scope.row.completedQuantity
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="status" label="状态">
+      <el-table-column width='150' prop="status" label="状态">
         <template slot-scope="scope">
-          <span v-if="scope.row.approveStatus">{{
-            scope.row.approveStatus
-          }}</span>
-          <el-popover v-else 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 v-if="scope.row.status != '执行中'">
+            <span v-if="scope.row.approveStatus">{{
+              scope.row.approveStatus
+            }}</span>
+            <el-popover v-else 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" 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>
-            </div>
-          </el-popover>
-          <img v-if="!scope.row.approveStatus" 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> -->
+            </el-popover>
+            <img v-if="!scope.row.approveStatus" width="17" height="18"
+              style="vertical-align: text-top; position: relative; top: -1px;" src="../../../public/img/edit.png"
+              @click="editClick(scope.row)" alt="" />
+          </div>
+          <div v-else>
+            <!-- {{scope.row.status}} -->
+            <el-select v-model="scope.row.status" placeholder="" class="statusselect"
+            @change='selectstatuschange($event,scope.row)'
+            :value="scope.row.status"
+          >
+            <el-option v-for="item in statusList" :key="item.value" :label="item.value" :value="item.value"
+              style="color: #8890b1" />
+          </el-select>
+          </div>
         </template>
       </el-table-column>
       <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
       <el-table-column prop="contractExpenditure" label="合同支出"> </el-table-column>
       <el-table-column prop="expenses" label="费用支出"> </el-table-column>
       
-      <el-table-column prop="mildewGrain" label="已付款（元）">
+      <el-table-column width='130' prop="mildewGrain" label="已付款（元）">
       </el-table-column>
       <el-table-column prop="amountEdPayable" label="已付运费"> </el-table-column>
-      <el-table-column prop="goodsNames" label="已开发票 （元）">
+      <el-table-column width='130' prop="goodsNames" label="已开发票 （元）">
       </el-table-column>
       <el-table-column prop="addressUrl" label="附件">
         <template slot-scope="scope">
@@ -210,6 +221,9 @@
         // 表格显示数据
         tableDate: [],
         size: 10,
+        statusList:[{
+          value:'已完成',
+        },{value:'发运结束',}],
         // 是否显示
         showType: true,
         // 年
@@ -361,6 +375,36 @@
       handleClose() {
         this.dialogViewSpareMoney = false
       },
+      selectstatuschange(e,row){
+        var data={}
+        if(e=='发运结束'){
+          data={id: row.id,endFlag:1}
+        }else{
+          data={id: row.id}
+        }
+        this.$confirm(`是否将状态改为${e}`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            editstatus(data)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '状态修改成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`)
         this.pageSize = val
@@ -429,7 +473,7 @@
         var status = ''
         if (row.status == '待执行' || row.status == '已完成') {
           status = '执行中'
-        } else if (row.status == '执行中') {
+        } else if (row.status == '执行中'||row.status == '发运结束') {
           status = '已完成'
         }
         this.$confirm(`是否将状态改为${status}`, '提示', {
@@ -929,4 +973,8 @@
   /deep/.typeselect .el-input__inner {
     color: #8890b1;
   }
+  /deep/.statusselect .el-input__inner {
+    color: #8890b1;
+    width:100%;
+  }
 </style>

src/views/contractManagement/salesContract.vue

@@ -61,12 +61,11 @@
         </template>
       </el-table-column> -->
       <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
-      <el-table-column prop="unitContractPrice" label="合同单价（元）">
-      </el-table-column>
+      <el-table-column width='150' prop="unitContractPrice" label="合同单价（元）"></el-table-column>
       <!-- <el-table-column prop="packingMethod" label="包装方式"> </el-table-column> -->
       <el-table-column prop="buyer" label="买方"> </el-table-column>
       <el-table-column prop="seller" label="卖方"> </el-table-column>
-      <el-table-column prop="completedQuantity" label="已完成（吨）">
+      <el-table-column width='150' prop="completedQuantity" label="已完成（吨）">
         <template slot-scope="scope">
           <span v-if="scope.row.proportion < 90"
             style="color: #5473e8; font-weight: 600">{{ scope.row.completedQuantity }}</span>
@@ -74,45 +73,57 @@
             style="color: red; font-weight: 600">{{ scope.row.completedQuantity }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="status" label="状态">
+      <el-table-column width='150' prop="status" label="状态">
         <template slot-scope="scope">
-          <span v-if="scope.row.approveStatus">{{
-            scope.row.approveStatus
-          }}</span>
-          <el-popover v-else 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" 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 v-if="scope.row.status != '执行中'">
+            <span v-if="scope.row.approveStatus">{{
+              scope.row.approveStatus
+            }}</span>
+            <el-popover v-else 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" 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>
-            </div>
-          </el-popover>
-          <img v-if="!scope.row.approveStatus" width="17" height="18"
-            style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
-            @click="editClick(scope.row)" alt="" />
+            </el-popover>
+            <img v-if="!scope.row.approveStatus" width="17" height="18"
+              style="vertical-align: text-top; position: relative; top: -1px;" src="../../../public/img/edit.png"
+              @click="editClick(scope.row)" alt="" />
+          </div>
+          <div v-else>
+            <!-- {{scope.row.status}} -->
+            <el-select v-model="scope.row.status" placeholder="" class="statusselect"
+            @change='selectstatuschange($event,scope.row)'
+            :value="scope.row.status"
+          >
+            <el-option v-for="item in statusList" :key="item.value" :label="item.value" :value="item.value"
+              style="color: #8890b1" />
+          </el-select>
+          </div>
         </template>
       </el-table-column>
       <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
       <el-table-column prop="contractRevenue" label="合同收入"> </el-table-column>
       <el-table-column prop="expenses" label="费用支出"> </el-table-column>
-      <el-table-column prop="mildewGrain" label="未回款（元）">
+      <el-table-column width='120' prop="mildewGrain" label="未回款（元）">
         <template slot-scope="scope">
         <span style='color:red;' v-if='scope.row.datestatus&&scope.row.invoiced>scope.row.contractRevenue'>{{scope.row.mildewGrain}}</span>
         <span v-else>{{scope.row.mildewGrain}}</span>
@@ -219,6 +230,7 @@
         showType: true,
         // 年
         year: '',
+        currectstatus:'',
         deptBudgetTotal: 0,
         currentPage: 1,
         pageSize: 9999,
@@ -251,6 +263,9 @@
             return time.getTime() > Date.now()
           },
         },
+        statusList:[{
+          value:'已完成',
+        },{value:'发运结束',}],
         accessoryTFs: false,
         accesscard: false,
         accessurl: '',
@@ -329,6 +344,36 @@
       this.showType = this.isShow
     },
     methods: {
+      selectstatuschange(e,row){
+        var data={}
+        if(e=='发运结束'){
+          data={id: row.id,endFlag:1}
+        }else{
+          data={id: row.id}
+        }
+        this.$confirm(`是否将状态改为${e}`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            editstatus(data)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '状态修改成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
       onChange() {
         this.$refs.upload
           .handleSaveBill()
@@ -471,7 +516,7 @@
         var status = ''
         if (row.status == '待执行' || row.status == '已完成') {
           status = '执行中'
-        } else if (row.status == '执行中') {
+        } else if (row.status == '执行中'||row.status == '发运结束') {
           status = '已完成'
         }
         //cancelButtonClass: "btn-custom-cancel"
@@ -997,4 +1042,8 @@
   /deep/.typeselect .el-input__inner {
     color: #8890b1;
   }
+  /deep/.statusselect .el-input__inner {
+    color: #8890b1;
+    width:100%;
+  }
 </style>