前端

src/views/record/record.vue

@@ -74,18 +74,16 @@
         </el-table-column>
         <el-table-column prop="address" label="更多指标" >
           <template slot-scope="scope">
-<<<<<<< HEAD
+
             <div v-if="scope.row.carNumber!='盘盈'&&scope.row.carNumber!='盘亏'" @click="moreindicator(scope.row)" style="color:cornflowerblue">查看</div>
-=======
-            <div style="color:cornflowerblue" @click="moreInfo(scope.row)">查看</div>
->>>>>>> 82bcf6d154fbd300e527c36418d489744c1d142e
+
+            <!-- <div style="color:cornflowerblue" @click="moreInfo(scope.row)">查看</div> -->
           </template>
         </el-table-column>
         <el-table-column prop="unitPrice" label="单价（元/吨）" width="100">
         </el-table-column>
         <el-table-column prop="grainFund" label="粮款（元）" show-overflow-tooltip>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column prop="address" label="备注" >
           <template slot-scope="scope">
             <el-popover v-if="scope.row.remark"
@@ -96,12 +94,6 @@
             :content="scope.row.remark">
             <div slot="reference" style="color:cornflowerblue">查看</div>
           </el-popover>
-            
-=======
-        <el-table-column prop="address" label="备注" show-overflow-tooltip>
-          <template slot-scope="scope" v-if="scope.row.remark">
-            <div style="color:cornflowerblue" @click="lookRemark(scope.row.remark)">查看</div>
->>>>>>> 82bcf6d154fbd300e527c36418d489744c1d142e
           </template>
         </el-table-column>
         <el-table-column prop="createDate" label="日期" width="140">
@@ -191,13 +183,8 @@
         </el-form-item>
       </el-form>
     </el-dialog>
-<<<<<<< HEAD
-    <el-dialog width="320px" :close-on-click-modal="false" :title="inventoryTitle" :visible.sync="isShowInventory" :append-to-body="true"
-=======
-    <el-dialog width="320px" title="备注信息" :visible.sync="isShowRemark" :append-to-body="true" :close="remarkClose">
-      {{ remarkVal }}
-    </el-dialog>
-    <el-dialog width="320px" title="指标信息" :visible.sync="isShowMoreInfo" :append-to-body="true" :close="moreInfoClose">
+
+    <!-- <el-dialog width="320px" title="指标信息" :visible.sync="isShowMoreInfo" :append-to-body="true" :close="moreInfoClose">
       <el-form class="customer" label-position="right" label-width="80px">
         <el-form-item label="水分">
           <el-input disabled size="small" v-model="moreInfoObj.waterContent" />
@@ -221,9 +208,9 @@
           <el-input disabled size="small" v-model="moreInfoObj.protein" />
         </el-form-item>
       </el-form>
-    </el-dialog>
+    </el-dialog> -->
     <el-dialog width="320px" :title="inventoryTitle" :visible.sync="isShowInventory" :append-to-body="true"
->>>>>>> 82bcf6d154fbd300e527c36418d489744c1d142e
+
       :close="inventoryClose">
       <el-form class="customer" label-position="right" label-width="120px">
         <el-form-item class="customer-item" label="货名">
@@ -346,12 +333,10 @@ export default {
 
   },
   methods: {
-<<<<<<< HEAD
     moreindicator(row){
       this.goodindexObj=row
       this.isShowindex=true
     },
-=======
     moreInfoClose(){
       this.isShowMoreInfo = false
     },
@@ -367,7 +352,6 @@ export default {
       this.isShowRemark = true
     },
     // 更改已付、未付、已收、未收状态
->>>>>>> 82bcf6d154fbd300e527c36418d489744c1d142e
     changeStatus(val) {
       if (val.status == '已付') {
         val.status = "未付"
@@ -404,7 +388,6 @@ export default {
         this.pSubmitObj.inOutFlag = 2
         this.pSubmitObj.noFlag = 'PY'
       }
-<<<<<<< HEAD
       
       // //查看编号
       // await selectInOutCount({
@@ -415,8 +398,7 @@ export default {
       //     this.pSubmitObj.noFlag = res
       //   })
       // console.log(this.pSubmitObj)
-=======
->>>>>>> 82bcf6d154fbd300e527c36418d489744c1d142e
+
       await speedWarehouseInOutInfoAdd(this.pSubmitObj).toPromise()
         .then((res) => {
           this.$message.success('提交成功！')
@@ -462,12 +444,10 @@ export default {
       this.goodsObj = this.goodsList.filter((item) => {
         if (val == item.goodsName) return item
       })[0]
-<<<<<<< HEAD
       this.storage =''
       this.weightedCost=''
       console.log(this.goodsObj)
-=======
->>>>>>> 82bcf6d154fbd300e527c36418d489744c1d142e
+
     },
     //盘盈盘亏选择货名
     changeGoodsName1(val) {
@@ -507,12 +487,9 @@ export default {
       }
       this.getList()
     },
-<<<<<<< HEAD
     getGoodSName(status) {
-=======
     //货名下拉
-    getGoodSName() {
->>>>>>> 82bcf6d154fbd300e527c36418d489744c1d142e
+
       speedGoodsList({
         compId: localStorage.getItem('ws-pf_compId')
       })
@@ -654,22 +631,11 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-<<<<<<< HEAD
-        speedWarehouseInOutInfoDel({id:val.id}).toPromise().then(() => {
-          this.$message({
-              type: 'success',
-              message: '删除成功!'
-            });
-            this.getList()
-        })
-=======
         speedWarehouseInOutInfoDel({ id: val.id}).toPromise()
           .then((res) => {
               this.$message.success('删除成功！')
               this.getList()
           })
-
->>>>>>> 82bcf6d154fbd300e527c36418d489744c1d142e
       }).catch(() => {
         return false
       });