前端 采购计划完成 sdy

src/api/V2/purchasingManagement/index.js

@@ -13,4 +13,6 @@ export const API_POST_PROCUREMENT_ADD = '/procurementPlanInfo/api/insertProcurem
 //采购计划编辑
 export const API_POST_PROCUREMENT_EDIT = '/procurementPlanInfo/api/editProcurementPlan'
 //采购计划删除
-export const API_POST_PROCUREMENT_DELETE = '/procurementPlanInfo/api/deleteProcurementPlan'
+export const API_POST_PROCUREMENT_DELETE = '/procurementPlanInfo/api/deleteProcurementPlan'
+//采购状态，基差，单价修改 
+export const API_POST_PROCUREMENT_EDITSTATUS = '/procurementPlanInfo/api/editStatus'

src/model/purchasingManagement/index.js

@@ -9,6 +9,7 @@ import {
     API_POST_PROCUREMENT_ADD,
     API_POST_PROCUREMENT_EDIT,
     API_POST_PROCUREMENT_DELETE,
+    API_POST_PROCUREMENT_EDITSTATUS,
 } from '@/api/V2/purchasingManagement'
 // import { API_GET_PROCUREMENT_LOOK } from '../../api/V2/purchasingManagement'
 //采购详情列表
@@ -27,3 +28,5 @@ export const procurementAdd = appRx.post(API_POST_PROCUREMENT_ADD, errorCatcher,
 export const procurementEdit = appRx.post( API_POST_PROCUREMENT_EDIT, errorCatcher, errorHandle,filter)
 //采购计划删除
 export const procurementDel = appRx.post(API_POST_PROCUREMENT_DELETE, errorCatcher,errorHandle,filter)
+//采购状态，基差，单价修改
+export const procurementEditOther = appRx.post(API_POST_PROCUREMENT_EDITSTATUS, errorCatcher,errorHandle,filter)

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -815,17 +815,21 @@ export default {
               this.dataList.procurementPlanNo='CGJH'+this.getdate()+this.verifyinit()
               this.dataList.sourceProvince = CodeToText[this.selectedOptions[0]]
               this.dataList.sourceCity = CodeToText[this.selectedOptions[1]]
-
-              this.dataList.deliveryProvince =
+ this.dataList.receivePrivate =  CodeToText[this.selectedOptions[0]]
+ this.dataList.receiveCity = CodeToText[this.selectedOptions[1]]
+ this.dataList.receiveArea = CodeToText[this.selectedOptions[2]]
+              this.dataList.outputPrivate =
                 CodeToText[this.selectedOptions1[0]]
-              this.dataList.deliveryCity = CodeToText[this.selectedOptions1[1]]
+              this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
 
               this.dataList.compId = this.compId
+
+              
               // this.dataList.contractType = 1
               // this.dataList.goodsType = 1
               this.dataList.pcFlag = 1
               this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
-
+              console.log(this.dataList,"查看添加对象")
               procurementAdd(this.dataList)
                 .toPromise()
                 .then(response => {
@@ -840,7 +844,6 @@ export default {
           })
         })
         .catch(() => {
-          console.log(3523543534)
           return false
         })
     },

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -252,7 +252,7 @@
           </ws-form-item>
           <!--产地-->
           <ws-form-item label="产地" span="1" prop="unitPrice">
-            <el-cascader
+            <!-- <el-cascader
               :options="options_"
               v-model="selectedOptions1"
               clearable
@@ -260,20 +260,28 @@
               placeholder="请选择产地"
               @change="handleChange1"
               style="width:200%"
+            /> -->
+            <el-cascader
+              :options="options1_"
+              v-model="selectedOptions1"
+              clearable
+              size="large"
+              placeholder="请选择产地"
+              @change="handleChange1"
+              style="width:200%"
             />
           </ws-form-item>
           <!--产出年份-->
           <el-form-item label="产出年份" span="1" prop="outputYear">
-           <el-date-picker
-              v-model="outputYear"
-              type="daterange"
+
+        <el-date-picker
+              v-model="dataList.outputYear"
+              type="year"
               align="right"
               unlink-panels
               range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-        >
-        </el-date-picker>
+              placeholder="开始日期"
+            ></el-date-picker>
           </el-form-item>
         </el-form>
       </div>
@@ -286,7 +294,7 @@
 </template>
 <script>
 import { procurementLook , procurementEdit } from '@/model/purchasingManagement/index'
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
+import { regionData, CodeToText, TextToCode ,provinceAndCityDataPlus} from 'element-china-area-data'
 import { pullDown } from '@/model/warehouse/index'
 import { packList } from '@/model/contarct/index'
 import {  getwarehousename } from '@/model/tasksport/index'
@@ -327,6 +335,7 @@ export default {
       showType: true,
       // 年
       year: '',
+     options1_: provinceAndCityDataPlus,
        options_: regionData,
       packingTypeList: '',
       procurementPlanTypeList: '',
@@ -530,7 +539,7 @@ export default {
       this.dataList.receiveArea = CodeToText[value[2]]
     },
     handleChange1(value) {
-      this.selectedOptions = value
+      this.selectedOptions1 = value
       this.dataList.receivePrivate = CodeToText[value[0]]
       this.dataList.receiveCity = CodeToText[value[1]]
       this.dataList.receiveArea = CodeToText[value[2]]
@@ -555,6 +564,15 @@ export default {
         .toPromise()
         .then((response) => {
           this.dataList = response
+          var tmp =[]
+          tmp[0] = TextToCode[this.dataList.receivePrivate].code
+          tmp[1] = TextToCode[this.dataList.receivePrivate][this.dataList.receiveCity].code
+          tmp[2] = TextToCode[this.dataList.receivePrivate][this.dataList.receiveCity][this.dataList.receiveArea].code
+          this.selectedOptions = tmp
+            var tmp1 =[]
+              tmp1[0] = TextToCode[this.dataList.outputPrivate].code
+          tmp1[1] = TextToCode[this.dataList.outputPrivate][this.dataList.outputCity].code
+            this.selectedOptions1 = tmp1
         })
       // 货名
       packList({ constId: 'CON2' })
@@ -760,6 +778,7 @@ export default {
         return
       }
       this.dataList.id = this.$route.query.id
+      // this.deptList.flag = 0
       this.$confirm(`提交后该采购信息将发布到交易平台，是否确定提交？`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
@@ -773,10 +792,12 @@ export default {
             CodeToText[this.selectedOptions[0]]
           this.dataList.sourceCity = CodeToText[this.selectedOptions[1]]
 
-          this.dataList.deliveryProvince =
-            CodeToText[this.selectedOptions1[0]]
-          this.dataList.deliveryCity =
-            CodeToText[this.selectedOptions1[1]]
+          this.dataList.receivePrivate =  CodeToText[this.selectedOptions[0]]
+ this.dataList.receiveCity = CodeToText[this.selectedOptions[1]]
+ this.dataList.receiveArea = CodeToText[this.selectedOptions[2]]
+              this.dataList.outputPrivate =
+                CodeToText[this.selectedOptions1[0]]
+              this.dataList.outputCity = CodeToText[this.selectedOptions1[1]]
             
           this.dataList.compId = this.compId
           // this.dataList.pcFlag = 1

src/views/purchasingManagement/procurementPlanList.vue

@@ -2,10 +2,10 @@
 <template>
   <div class="container">
     <!-- <div> -->
-    <div>
+    <!-- <div>
       <ws-input
         v-model="searchKeyWord"
-        placeholder="可按照合同编号和任务编号进行查找"
+        placeholder="可按采购计划编号和标题查找"
         clearable
         maxlength="500"
         type="input"
@@ -16,17 +16,44 @@
           width="16"
           height="16"
           style="
+            vertical-align: text-top;
+            position: relative;
+            top: 0px;
+            left: -8px;
+          "
+          src="../../../public/img/sousuo.png"
+          alt
+        />
+      </ws-button>
+    </div> -->
+  
+     <BaseHeaderLayout :leftSpan="10">
+      <template slot="left">  <ws-button type="primary" @click="handleAdd()">添加</ws-button> </template>
+      <!-- 接单开始 -->
+      <template slot="right">
+        <ws-input
+          v-model="searchKeyWord"
+          placeholder="可按采购计划编号和标题查找"
+          clearable
+          maxlength="500"
+          type="input"
+          class="findValue"
+        ></ws-input>
+        <ws-button class="find" type="primary" @click="find()"
+          ><img
+            width="16"
+            height="16"
+            style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
             "
-          src="../../../public/img/sousuo.png"
-          alt
-        />
-      </ws-button>
-    </div>
-    <ws-button type="primary" @click="handleAdd()">添加</ws-button>
+            src="../../../public/img/sousuo.png"
+            alt=""
+        /></ws-button>
+      </template>
+    </BaseHeaderLayout>
     <el-table
       class="wenzi"
       :data="warehouseList.records"
@@ -34,13 +61,76 @@
       height="780"
     >
       <el-table-column type="index" label="序号" width="80"></el-table-column>
-      <el-table-column class="table_td" prop="procurementPlanNo" label="采购计划编号"></el-table-column>
-      <el-table-column class="table_td" prop="title" label="标题"></el-table-column>
-      <el-table-column class="table_td" prop="goodsName" label="货名"></el-table-column>
-      <el-table-column class="table_td" prop="plannedPurchaseVolume" label="重量(吨)"></el-table-column>
-      <el-table-column class="table_td" prop="basisPrice" label="基差(元/吨)"></el-table-column>
-      <el-table-column class="table_td" prop="unitPrice" label="单价(元/吨)"></el-table-column>
-      <el-table-column class="table_td" prop="receiveWarehouse" label="收货库"></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="procurementPlanNo"
+        label="采购计划编号"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="title"
+        label="标题"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="goodsName"
+        label="货名"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="plannedPurchaseVolume"
+        label="重量(吨)"
+      ></el-table-column>
+      <el-table-column class="table_td" prop="basisPrice" label="基差(元/吨)">
+        <template slot-scope="scope">
+          <div v-if="scope.row.procurementPlanType == '期货'">
+            <div class="inputChenge">
+              <el-input
+                v-model="scope.row.basisPrice"
+                @change="varietyClick(scope.row)"
+                class="inputs"
+              ></el-input>
+            </div>
+            <img
+              width="17"
+              height="18"
+              style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png"
+              @click="varietyClick(scope.row)"
+              alt=""
+            />
+          </div>
+          <div v-else>—</div>
+        </template>
+      </el-table-column>
+      <el-table-column class="table_td" prop="unitPrice" label="单价(元/吨)">
+        <template slot-scope="scope">
+          <div v-if="scope.row.procurementPlanType == '现货'">
+            <div class="inputChenge">
+              <!-- readonly -->
+              <el-input
+                v-model="scope.row.unitPrice"
+                v-bind:class="inputs"
+                @change="varietyClick(scope.row)"
+              ></el-input>
+            </div>
+            <img
+              width="17"
+              height="18"
+              style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png"
+              @click="varietyClick(scope.row)"
+              alt=""
+            />
+          </div>
+          <div v-else>—</div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="receiveWarehouse"
+        label="收货库"
+      ></el-table-column>
       <el-table-column prop="status" label="状态">
         <template slot-scope="scope">
           <el-popover
@@ -52,17 +142,30 @@
           >
             <template>
               <span slot="reference">
-                <span v-if="scope.row.showFlag == 1"> <span class="executory"></span>展示中</span>
-                <span v-if="scope.row.showFlag == 0"> <span  class="inExecution"></span>已隐藏</span>
+                <span v-if="scope.row.showFlag == 1">
+                  <span class="executory"></span>展示中</span
+                >
+                <span v-if="scope.row.showFlag == 0">
+                  <span class="inExecution"></span>已隐藏</span
+                >
               </span>
             </template>
             <div>
               <!-- <p style="margin-top: 0; padding-left: 10px">历史记录</p> -->
-              <div v-for="(item, index) in historyList" class="flex" :key="index">
-                <div class="vertical-text vertical-text-left">{{ item.updateDate }}</div>
+              <div
+                v-for="(item, index) in historyList"
+                class="flex"
+                :key="index"
+              >
+                <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
+                    v-if="index != historyList.length - 1"
+                    class="vertical-line"
+                  ></div>
                 </div>
                 <div class="vertical-text">
                   {{ item.operateUser }}
@@ -72,9 +175,21 @@
               </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=""
+          />
         </template>
       </el-table-column>
-      <el-table-column class="table_td" label="更新时间" prop="updateDate"></el-table-column>
+      <el-table-column
+        class="table_td"
+        label="更新时间"
+        prop="updateDate"
+      ></el-table-column>
       <el-table-column prop="seller" label="操作" width="300">
         <template slot-scope="scope">
           <div class="record" @click="handleLook(scope.row)">查看</div>
@@ -97,7 +212,11 @@
   <!-- </div> -->
 </template>
 <script>
-import { procurementPlan , procurementDel } from '@/model/purchasingManagement/index'
+import {
+  procurementPlan,
+  procurementDel,
+  procurementEditOther,
+} from '@/model/purchasingManagement/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -106,7 +225,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination
+    Pagination,
   },
   watch: {
     vesselId(val) {
@@ -114,7 +233,7 @@ export default {
     },
     isShow(val) {
       this.showType = val
-    }
+    },
   },
   data() {
     return {
@@ -132,7 +251,7 @@ export default {
       year: '',
       pickerOptions: {},
       value2: '',
-      handleSizeChange:'',
+      handleSizeChange: '',
       deptBudgetTotal: 0,
       currentPage: 1,
       // tranTypeKey: 1,
@@ -141,7 +260,7 @@ export default {
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
-      pcFlag:1,
+      pcFlag: 1,
       // 提交类型
       submitType: true,
       size: 10,
@@ -152,14 +271,15 @@ export default {
       deptCircularPage: {},
       warehouseList: [],
       deptBudgetList: {},
-      pcFlag:1,
+      pcFlag: 1,
       historyList: [],
       pickerBeginDateBefore: {
-        disabledDate: time => {
+        disabledDate: (time) => {
           return time.getTime() > Date.now()
-        }
+        },
       },
-      accessoryTFs: false
+      accessoryTFs: false,
+      inputs: 'inputs1',
     }
   },
   activated() {
@@ -168,7 +288,6 @@ export default {
   },
   methods: {
     getList() {
-      console.log(123456)
       procurementPlan({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
@@ -177,9 +296,10 @@ export default {
         tranTypeKey: this.tranTypeKey,
         contractNo: this.contractNo,
         pcFlag: this.pcFlag,
+        searchKeyWord:this.searchKeyWord
       })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.warehouseList = response
         })
     },
@@ -187,23 +307,11 @@ export default {
       this.searchType = state
       this.getList()
     },
-    // delivery(item) {
-    //   this.$router.push({
-    //     path: 'warehouseManagementDelivery',
-    //     query: {
-    //       baseId: item.warehouseId,
-    //       positionId: item.binNumberId,
-    //       warehouseName: item.warehouseName,
-    //       binNumber: item.binNumber,
-    //       capacity: item.capacity
-    //     }
-    //   })
-    // },
     //编辑
     handleEdit(row) {
       this.$router.push({
         name: 'procurementPlanEdit',
-        query: {  id: row.id },
+        query: { id: row.id },
       })
     },
     getSpanArr(data) {
@@ -238,7 +346,7 @@ export default {
       })
     },
     //添加
-    handleAdd(){
+    handleAdd() {
       this.$router.push({
         name: 'procurementPlanAdd',
       })
@@ -248,23 +356,20 @@ export default {
       this.$router.push({
         name: 'procurementPlanLook',
         query: {
-         id: row.id
-        }
+          id: row.id,
+        },
       })
     },
     handleDelete(row) {
-     var handleDelete = ' '
-     if(row.handleDelete == ''){
-     }
-     this.$confirm(
-       `采购计划删除后不可恢复，是否确定删除？`,
-       {
-         cancelButtonText: '取消',
-         confirmButtonText: '确定',
-         type:'warning'
-       }
-     )
-      .then(() => {
+      var handleDelete = ' '
+      if (row.handleDelete == '') {
+      }
+      this.$confirm(`采购计划删除后不可恢复，是否确定删除？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      })
+        .then(() => {
           procurementDel({ id: row.id })
             .toPromise()
             .then((response) => {
@@ -282,9 +387,6 @@ export default {
           return false
         })
     },
-  },
-  
-
     //返回
     revert() {
       this.$router.push({ path: 'warehouseManagementList' })
@@ -295,7 +397,7 @@ export default {
         'Y+': date.getFullYear().toString(), // 年
         'm+': (date.getMonth() + 1).toString(), // 月
         'd+': date.getDate().toString(), // 日
-        'H+': date.getHours().toString() // 时
+        'H+': date.getHours().toString(), // 时
         // "M+": date.getMinutes().toString(),         // 分
         // "S+": date.getSeconds().toString()          // 秒
         // 有其他格式化字符需求可以继续添加，必须转化成字符串
@@ -326,34 +428,67 @@ export default {
     },
     editClick(row) {
       var status = ''
-      if (row.status == '待审核' || row.status == '已完成') {
-        status = '执行中'
-      } else if (row.status == '执行中') {
-        status = '已完成'
-      }
-      //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`是否将状态改为${status}`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          alsostate({ id: row.id })
-            .toPromise()
-            .then(response => {
-              this.$notify.success({
-                title: '成功',
-                message: '状态修改成功'
-              })
-              this.getList()
-            })
-            .catch(response => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-            })
+      var num = 1
+      if (row.showFlag == 1) {
+        status = '已隐藏'
+        num = 0
+        this.$confirm(`隐藏后交易信息不 再展示给客户，是否确定隐藏？`, {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
         })
-        .catch(() => {
-          return false
+          .then(() => {
+            procurementEditOther({
+              flag: 0,
+              showFlag: num,
+              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
+          })
+      } else if (row.showFlag == 0) {
+        status = '展示中'
+        num = 1
+        this.$confirm(`确定展示交易信息？`, {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
         })
+          .then(() => {
+            procurementEditOther({
+              flag: 0,
+              showFlag: num,
+              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
+          })
+      }
+      //cancelButtonClass: "btn-custom-cancel"
     },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {
@@ -379,7 +514,7 @@ export default {
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
-        query: { id: row.id }
+        query: { id: row.id },
       })
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
@@ -389,13 +524,13 @@ export default {
     history(row) {
       billoperatehis({ id: row.id })
         .toPromise()
-        .then(response => {
+        .then((response) => {
           this.historyList = response
         })
     },
     //查找
     find() {
-      this.currentPage = 1
+      // this.searchKeyWord = 1
       this.getList()
     },
     async exportlist() {
@@ -408,21 +543,78 @@ export default {
           searchType: this.searchType,
           searchKeyWord: this.searchKeyWord,
           startDate: this.startDate,
-          endDate: this.endDate
+          endDate: this.endDate,
         },
         {},
         { responseType: 'blob' }
       ).toPromise()
       downloadFile({
         res: data,
-        fileName: `${this.date.year +
-          (this.date.month ? `-${this.date.month}` : '')}_采购合同`,
-        type: 'xls'
+        fileName: `${
+          this.date.year + (this.date.month ? `-${this.date.month}` : '')
+        }_采购合同`,
+        type: 'xls',
       })
     },
-    total() {}
-  }
-
+    varietyClick(row) {
+      if (row.procurementPlanType == '期货') {
+        this.$confirm(`确定要修改基差？`, {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+          .then(() => {
+            procurementEditOther({
+              flag: 1,
+              basisPrice: row.basisPrice,
+              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
+          })
+      } else if (row.procurementPlanType == '现货') {
+        this.$confirm(`确定要修改单价？`, {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+          .then(() => {
+            procurementEditOther({
+              flag: 2,
+              unitPrice: row.unitPrice,
+              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
+          })
+      }
+    },
+  },
+}
 </script>
 <style lang="scss" scoped>
 .connert {
@@ -503,9 +695,6 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
-// .el-row{
-//     height: 150px;
-// }
 .base_header_layout .grid-content {
   margin-top: 80px;
 }
@@ -530,12 +719,15 @@ export default {
 }
 .executory {
   background: #ff9f24;
+  margin-right: 3px;
 }
 .inExecution {
   background: #5878e8;
+  margin-right: 3px;
 }
 .done {
   background: #50cad4;
+  margin-right: 3px;
 }
 .record,
 .adjustment {
@@ -598,7 +790,6 @@ export default {
 .el-button--primary {
   background-color: #5878e8;
   border-color: #5878e8;
-  // margin-left: 85%;
   margin-top: 20px;
 }
 //导航条样式
@@ -619,19 +810,25 @@ export default {
 }
 .but {
   margin-left: 30%;
-  /* margin-top: -32px; */
   overflow: auto;
-  /* float: left; */
-  /* margin-left: 1px; */
   margin-left: -10px;
 }
 .el-input--small {
   font-size: 13px;
   width: 390px;
-  margin-left: 74%;
 }
 /deep/.el-table .el-table__header .cell,
 .el-table .el-table__body .cell {
   text-align: center;
 }
-</style>
+.inputChenge {
+  width: 50%;
+  display: inline-flex;
+}
+.inputs1 {
+  border: none;
+}
+// .inputChenge>>>.el-input__inner{
+// border: none;
+// }
+</style>

src/views/purchasingManagement/procurementPlanLook.vue

@@ -66,7 +66,7 @@
           </el-form-item>
           <!--收货库所在地区-->
           <el-form-item label="收货库所在地区" span="1">
-            <!-- <el-input disabled v-model="dataList.unitPrice" maxlength="120" size="small" /> -->{{dataList.receivePrivate}}{{dataList.receiveCity}}{{dataList.receiveArea}}
+           {{dataList.receivePrivate}}{{dataList.receiveCity}}{{dataList.receiveArea}}
           </el-form-item>
           <!--运费承担方-->
           <el-form-item label="运费承担方">
@@ -77,7 +77,7 @@
             <el-input disabled v-model="dataList.packingType" filterable :filter-method="dataFilter"></el-input>
           </el-form-item>
           <!--装袋备注=-->
-          <el-form-item label="装袋备注">
+          <el-form-item label="装袋备注" v-if="dataList.packingType == '大袋' || dataList.packingType == '小袋'">
             <el-input disabled v-model="dataList.baggingNotes" size="small" />
           </el-form-item>
           <!-- 买方 -->
@@ -99,7 +99,6 @@
           <el-form-item label="水分(%)<=">
             <el-input disabled v-model="dataList.waterContent" class="typeselect" />
           </el-form-item>
-
           <!-- 容重 -->
           <el-form-item label="容重(g/l)<=">
             <el-input disabled v-model="dataList.bulkDensity" class="typeselect" />
@@ -170,9 +169,6 @@ export default {
     Pagination
   },
   watch: {
-    // vesselId(val) {
-    //   this.getList()
-    // },
     isShow(val) {
       this.showType = val
     }
@@ -357,27 +353,6 @@ export default {
     close() {
       this.$router.push({ path: 'procurementPlanList' })
     },
-    //提交按钮
-    // submit() {
-    //   if (this.dataList.taskTypeKey == 1) {
-    //     this.dataList.inOutTaskNo = this.inOutTaskNo
-    //     this.requestadd(this.dataList)
-    //   } else if (this.dataList.taskTypeKey == 2) {
-    //     this.dataList.inOutTaskNo = this.inOutTaskNo1
-    //     this.requestadd(this.dataList)
-    //   } else if (
-    //     this.dataList.taskTypeKey == 3 ||
-    //     this.dataList.taskTypeKey == 4
-    //   ) {
-    //     this.dataList.inOutTaskNo = this.inOutTaskNo
-    //     this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
-    //     this.requestadd(this.dataList, 'repetition')
-    //     this.dataList1.inOutTaskNo = this.inOutTaskNo1
-    //     this.dataList1.relevanceId = this.dataList.relevanceId
-    //     this.requestadd(this.dataList1, 'repetition')
-    //   }
-    // },
-    selectwarehouseName() {},
     tarechange(e) {
       if (this.dataList.grossWeight && this.dataList.tare) {
         this.dataList.netWeight = Number(
@@ -454,14 +429,6 @@ export default {
           this.dataList = response
         })
     },
-
-    // deletecontract(){},
-    //删除
-    approve() {},
-    listQuery() {},
-    total() {},
-    clearfiltQuery() {},
-    selectCrtDuty() {}
   }
 }
 </script>