加新字段 改顺序

SC-web/src/views/scm/basicInformation/contractfile/index.vue

@@ -92,8 +92,8 @@
               </el-button>
               <!--							<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑-->
               <!--							</el-button>-->
-              <!--							<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除-->
-              <!--							</el-button>-->
+              							<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
+              							</el-button>
               <el-button type="text" v-has="'btn_look'" @click="goDetail(scope.row.id)">查看
               </el-button>
             </template>

SC-web/src/views/scm/basicInformation/poundlist/Detail.vue

@@ -76,6 +76,13 @@
               </popupSelect>
             </el-form-item>
           </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="收货价格" prop="collectPrice">
+              <el-input-number v-model="dataForm.collectPrice" :style='{"width":"100%"}'></el-input-number>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="24">
             <el-form-item label="车辆图片" prop="vehiclePictures">
               <JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
@@ -242,6 +249,7 @@
           transportPrice: 0,
           salesPrice: 0,
           purchasePrice: 0,
+          collectPrice: 0,
           businessId: "",
           naturalId: "",
           remark: '',
@@ -313,6 +321,11 @@
             message: '请输入',
             trigger: 'blur'
           }, ],
+          collectPrice: [{
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          }, ],
           purchasePrice: [{
             required: true,
             message: '请输入',

SC-web/src/views/scm/basicInformation/poundlist/Form.vue

@@ -76,6 +76,13 @@
               </popupSelect>
             </el-form-item>
           </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="收货价格" prop="collectPrice">
+              <el-input-number v-model="dataForm.collectPrice" :style='{"width":"100%"}'></el-input-number>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="24">
             <el-form-item label="车辆图片" prop="vehiclePictures">
               <JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
@@ -108,6 +115,7 @@
               <el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}'></el-input-number>
             </el-form-item>
           </el-col>
+
           <el-col :span="6">
             <el-form-item label="磅单日期" prop="poundDate">
               <el-date-picker v-model="dataForm.poundDate" placeholder="请选择" clearable :style='{"width":"100%"}'
@@ -240,6 +248,7 @@
           transportType: "0",
           advance: "0",
           transportPrice: 0,
+          collectPrice: 0,
           salesPrice: 0,
           purchasePrice: 0,
           businessId: "",
@@ -313,6 +322,11 @@
             message: '请输入',
             trigger: 'blur'
           }, ],
+          collectPrice: [{
+            required: true,
+            message: '请输入',
+            trigger: 'blur'
+          }, ],
           purchasePrice: [{
             required: true,
             message: '请输入',

SC-web/src/views/scm/basicInformation/poundlist/index.vue

@@ -114,7 +114,6 @@
 				<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
 					@selection-change="handleSelectionChange" border>
           <el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
-          <el-table-column prop="poundlistNo" label="磅单号" width="200" align="center" sortable fixed="left" />
           <el-table-column prop="vehicleName" label="车号" fixed="left" sortable width="120" align="center" />
           <el-table-column prop="purchaseStatus" label="采购状态" sortable width="100" align="center" >
             <template slot-scope="scope">
@@ -126,16 +125,7 @@
               {{ scope.row.salesStatus | dynamicText(salesStatusOptions) }}
             </template>
           </el-table-column>
-					<el-table-column prop="customerName" label="客户名称" sortable width="150" align="center" />
-					<el-table-column prop="salesName" label="销售合同" sortable width="150" align="center" />
-					<el-table-column prop="supplierName" label="供应商名称" sortable width="150" align="center" />
-					<el-table-column prop="purchaseName" label="采购合同" sortable width="150" align="center" />
           <el-table-column prop="materialName" label="物料名称" sortable width="150" align="center" />
-          <el-table-column prop="advance" label="是否垫资" sortable width="100" align="center" >
-						<template slot-scope="scope">
-							{{ scope.row.advance | dynamicText(advanceOptions) }}
-						</template>
-					</el-table-column>
           <el-table-column prop="unit" label="单位" sortable width="100" align="center" >
             <template slot-scope="scope">
               {{ scope.row.unit | dynamicText(unitOptions) }}
@@ -143,11 +133,29 @@
           </el-table-column>
           <el-table-column prop="grossWeight" sortable label="毛重" width="100" align="center" />
           <el-table-column prop="tareWeight" sortable label="皮重" width="100" align="center" />
-					<el-table-column prop="buckleWeight" sortable label="扣重" width="100" align="center" />
           <el-table-column prop="netWeight" sortable label="净重" width="100" align="center" />
+          <el-table-column prop="buckleWeight" sortable label="扣重" width="100" align="center" />
           <el-table-column prop="settlement" sortable label="结算重量" width="100" align="center" />
           <el-table-column prop="purchasePrice" sortable label="采购单价" width="100" align="center" />
           <el-table-column prop="salesPrice" sortable label="销售价格" width="100" align="center" />
+          <el-table-column prop="collectPrice" sortable label="收货价格" width="100" align="center" />
+
+          <el-table-column prop="poundlistNo" label="磅单号" width="200" align="center" sortable  />
+					<el-table-column prop="customerName" label="客户名称" sortable width="150" align="center" />
+					<el-table-column prop="salesName" label="销售合同" sortable width="150" align="center" />
+					<el-table-column prop="supplierName" label="供应商名称" sortable width="150" align="center" />
+					<el-table-column prop="purchaseName" label="采购合同" sortable width="150" align="center" />
+
+          <el-table-column prop="advance" label="是否垫资" sortable width="100" align="center" >
+						<template slot-scope="scope">
+							{{ scope.row.advance | dynamicText(advanceOptions) }}
+						</template>
+					</el-table-column>
+
+          <el-table-column prop="creatorTime" label="创建时间" width="200" align="center" sortable
+          />
+
+
 					<el-table-column prop="inputDate" sortable label="进项票日期" width="150" align="center" />
 					<el-table-column prop="outputDate" sortable label="销项票日期" width="150" align="center" />
 					<el-table-column prop="payDate" sortable label="付款日期" width="150" align="center" />
@@ -316,6 +324,7 @@
 						prop: 'unit',
 						label: '单位'
 					},
+          { prop: 'creatorTime', label: '创建时间' },
 					{
 						prop: 'grossWeight',
 						label: '毛重'
@@ -344,6 +353,10 @@
 						prop: 'salesPrice',
 						label: '销售价格'
 					},
+          {
+            prop: 'collectPrice',
+            label: '收货价格'
+          },
 					{
 						prop: 'inputDate',
 						label: '进项票日期'
@@ -593,6 +606,7 @@
           })
           return
         }
+
         const ids = this.multipleSelection.join()
         request({
           url: `/api/poundlist/Poundlist/createsale/${ids}`,