Merge branch 'main' of http://222.71.165.188:3000/linkage/SC-MOM

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java

@@ -9,18 +9,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.hutool.core.util.ObjectUtil;
 import jnpf.customer.mapper.CustomerVMapper;
 import jnpf.customer.entity.CustomerEntity;
-
-import jnpf.model.EmployeeModel;
-import jnpf.model.employee.EmployeeImportVO;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
-
-
 import jnpf.contractfile.model.contractfile.ContractFilePagination;
-
 import jnpf.permission.service.AuthorizeService;
-
 import java.lang.reflect.Field;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 
 
@@ -78,7 +70,7 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
         int contract_item1Num = 0;
         QueryWrapper<Contract_item1Entity> contract_item1QueryWrapper = new QueryWrapper<>();
         boolean pcPermission = true;
-        boolean appPermission = false;
+        boolean appPermission = true;
         boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
         if (isPc && pcPermission) {
             if (!userProvider.get().getIsAdministrator()) {
@@ -176,7 +168,7 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
         int contract_item1Num = 0;
         QueryWrapper<Contract_item1Entity> contract_item1QueryWrapper = new QueryWrapper<>();
         boolean pcPermission = true;
-        boolean appPermission = false;
+        boolean appPermission = true;
         boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
         if (isPc && pcPermission) {
             if (!userProvider.get().getIsAdministrator()) {

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadCrForm.java

@@ -99,6 +99,10 @@ public class TradeuploadCrForm  {
     @JsonProperty("transportPrice")
     private String transportPrice;
 
+    /** 运费 **/
+    @JsonProperty("originPlace")
+    private String originPlace;
+
     /** 销售价格 **/
     @JsonProperty("salesPrice")
     private String salesPrice;

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadInfoVO.java

@@ -87,6 +87,10 @@ public class TradeuploadInfoVO{
         @JsonProperty("transportPrice")
         private String transportPrice;
 
+        /** 运费 **/
+        @JsonProperty("originPlace")
+        private String originPlace;
+
         /** 销售价格 **/
         @JsonProperty("salesPrice")
         private String salesPrice;

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadListVO.java

@@ -105,6 +105,11 @@ public class TradeuploadListVO{
     private String transportPrice;
 
 
+    /** 运费 **/
+    @JsonProperty("originPlace")
+    private String originPlace;
+
+
     /** 销售价格 **/
     @JsonProperty("salesPrice")
     private String salesPrice;

SC-web/src/views/permission/user/index.vue

@@ -41,7 +41,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="search()">
+              <el-button type="primary" icon="el-icon-search"  v-has="'btn_add'" @click="search()">
                 {{$t('common.search')}}</el-button>
               <el-button icon="el-icon-refresh-right" @click="reset()">{{$t('common.reset')}}
               </el-button>

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

@@ -92,7 +92,8 @@
 									:style='{"width":"100%"}'>
 
 								</el-input> -->
-								<el-input-number v-model="dataForm.collectionCycle" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
+								<el-input-number v-model="dataForm.collectionCycle" :min="0" label="请输入"
+									:style='{ "width": "100%" }'></el-input-number>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
@@ -112,18 +113,47 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="供应商/客户编" prop="code">
+							<el-form-item label="供应商/客户" prop="code">
+								<template v-if="dataForm.contractType === '0'">
+									<popupSelect v-model="dataForm.code" propsValue="id" relationField='supplier_name'
+										vModel='code' :columnOptions="codeColumnOptions" interfaceId="382494924156735557"
+										:pageSize="20" placeholder="请选择供应商" type="popup">
+									</popupSelect>
+								</template>
+								<template v-else-if="dataForm.contractType === '1'">
+									<popupSelect v-model="dataForm.code" propsValue="id" relationField='supplier_nm'
+										vModel='dataForm.code' :columnOptions="nameColumnOptions"
+										interfaceId="395936123471343749" :pageSize="20" placeholder="请选择客户" type="popup">
+									</popupSelect>
+								</template>
+								<template v-else>
+									无
+								</template>
+							</el-form-item>
+							<!-- <u-form-item label="供应商/客户id" prop="code">
+								<jnpf-popup-select v-model="dataForm.code" propsValue="id" relationField='fullName'
+									vModel='dataForm.code' :columnOptions="codeColumnOptions" interfaceId="382494924156735557"
+									:pageSize="20" placeholder="请选择" type="popup">
+								</jnpf-popup-select>
+							</u-form-item> -->
+							<!-- <el-form-item label="供应商/客户编" prop="code">
 								<el-input v-model="dataForm.code" placeholder="请输入" clearable :style='{ "width": "100%" }'>
 
 								</el-input>
-							</el-form-item>
+							</el-form-item> -->
 						</el-col>
 						<el-col :span="8">
-							<el-form-item label="供应商/客户名" prop="name">
+							<!-- <u-form-item label="供应商/客户id" prop="code">
+								<jnpf-popup-select v-model="dataForm.code" propsValue="id" relationField='fullName'
+									vModel='dataForm.code' :columnOptions="nameColumnOptions" interfaceId="395936123471343749"
+									:pageSize="20" placeholder="请选择" type="popup">
+								</jnpf-popup-select>
+							</u-form-item> -->
+							<!-- <el-form-item label="供应商/客户名" prop="name">
 								<el-input v-model="dataForm.name" placeholder="请输入" clearable :style='{ "width": "100%" }'>
 
 								</el-input>
-							</el-form-item>
+							</el-form-item> -->
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="对方合同号" prop="contractNo">
@@ -137,20 +167,22 @@
 							<el-form-item label="币种 " prop="currency">
 								<el-select v-model="dataForm.currency" placeholder="请选择" clearable
 									:style='{ "width": "100%" }'>
-									<el-option v-for="(item, index) in currencyOptions" :key="index"
-										:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
+									<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName"
+										:value="item.id" :disabled="item.disabled"></el-option>
 
 								</el-select>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="数量" prop="num">
-								<el-input-number v-model="dataForm.num" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
+								<el-input-number v-model="dataForm.num" :min="0" label="请输入"
+									:style='{ "width": "100%" }'></el-input-number>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="金额" prop="amount">
-								<el-input v-model="dataForm.amount"  placeholder="请输入" clearable :style='{"width":"100%"}'></el-input>
+								<el-input v-model="dataForm.amount" placeholder="请输入" clearable
+									:style='{ "width": "100%" }'></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
@@ -262,34 +294,42 @@
 												</el-table-column>
 												<el-table-column prop="num" label="数量" align="center">
 													<template slot-scope="scope">
-														<el-input-number v-model="scope.row.num" :min="0" label="请输入" :style='{"width":"100%"}'></el-input-number>
+														<el-input-number v-model="scope.row.num" :min="0" label="请输入"
+															:style='{ "width": "100%" }'></el-input-number>
 													</template>
 												</el-table-column>
 												<el-table-column prop="price" label="单价" align="center">
 													<template slot-scope="scope">
-														<el-input v-model="scope.row.price" placeholder="请输入" clearable :style='{"width":"100%"}'></el-input>
+														<el-input v-model="scope.row.price" placeholder="请输入" clearable
+															:style='{ "width": "100%" }'></el-input>
 													</template>
 												</el-table-column>
 												<el-table-column prop="amount" label="金额" align="center">
 													<template slot-scope="scope">
-														<el-input v-model="scope.row.amount" placeholder="请输入" clearable :style='{"width":"100%"}'></el-input>
+														<el-input v-model="scope.row.amount" placeholder="请输入" clearable
+															:style='{ "width": "100%" }'></el-input>
 													</template>
 												</el-table-column>
 												<el-table-column prop="rate" label="税率 " align="center">
 													<template slot-scope="scope">
-														<el-select v-model="scope.row.rate" :min="0" label="请输入" :style='{"width":"100%"}'>
-                              <el-option v-for="(item, index) in rateOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
+														<el-select v-model="scope.row.rate" :min="0" label="请输入"
+															:style='{ "width": "100%" }'>
+															<el-option v-for="(item, index) in rateOptions" :key="index"
+																:label="item.fullName" :value="item.id"
+																:disabled="item.disabled"></el-option>
 														</el-select>
 													</template>
 												</el-table-column>
 												<el-table-column prop="notPrice" label="不含税单价" align="center">
 													<template slot-scope="scope">
-														<el-input v-model="scope.row.notPrice" placeholder="请输入" clearable :style='{"width":"100%"}'></el-input>
+														<el-input v-model="scope.row.notPrice" placeholder="请输入" clearable
+															:style='{ "width": "100%" }'></el-input>
 													</template>
 												</el-table-column>
 												<el-table-column prop="notAmount" label="不含税金额" align="center">
 													<template slot-scope="scope">
-														<el-input v-model="scope.row.notAmount" placeholder="请输入" clearable :style='{"width":"100%"}'></el-input>
+														<el-input v-model="scope.row.notAmount" placeholder="请输入" clearable
+															:style='{ "width": "100%" }'></el-input>
 													</template>
 												</el-table-column>
 												<el-table-column prop="remark" label="备注" align="center">
@@ -361,6 +401,30 @@
 	props: [],
 	data() {
 		return {
+			codeColumnOptions: [
+				{
+					"label": "供应商Code",
+					"value": "supplier_code"
+				},
+				{
+					"label": "供应商",
+					"value": "supplier_name"
+				},
+			],
+			nameColumnOptions: [
+				{
+					"label": "ID",
+					"value": "id"
+				},
+				{
+					"label": "客户编码",
+					"value": "supplier_cd"
+				},
+				{
+					"label": "客户名称",
+					"value": "supplier_nm"
+				},
+			],
 			visible: false,
 			loading: false,
 			isDetail: false,
@@ -460,7 +524,11 @@
 		}
 	},
 	computed: {},
-		watch: {},
+	watch: {
+		'dataForm.contractType': function (newQuestion, oldQuestion) {
+			this.dataForm.code = '';
+		}
+	},
 	created() { },
 	mounted() { },
 	methods: {

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

@@ -25,14 +25,14 @@
       <div class="JNPF-common-layout-main JNPF-flex-main">
         <div class="JNPF-common-head">
           <div>
-            <el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()">新增
+            <el-button type="primary" icon="el-icon-plus" v-has="'btn_add'" @click="addOrUpdateHandle()">新增
             </el-button>
             <!--            <el-button type="text" icon="=el-icon-detail" @click="goDetail(scope.row.id)">查看-->
             <!--            </el-button>-->
-            <el-button type="text" icon="el-icon-download" @click="exportData()">导出
+            <el-button type="text" icon="el-icon-download" v-has="'btn_download'" @click="exportData()">导出
             </el-button>
 
-            <el-button type="text" icon="el-icon-upload2" @click="uploadForm">导入</el-button>
+            <el-button type="text" icon="el-icon-upload2" @click="uploadForm" v-has="'btn_upload'">导入</el-button>
 
 
           </div>
@@ -88,13 +88,13 @@
 
           <el-table-column label="操作" fixed="right" width="150">
             <template slot-scope="scope">
-              <el-button type="text" @click="exportData()">导出
+              <el-button type="text" v-has="'btn_upload'" @click="exportData()">导出
               </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" @click="goDetail(scope.row.id)">查看
+              <el-button type="text" v-has="'btn_look'" @click="goDetail(scope.row.id)">查看
               </el-button>
             </template>
           </el-table-column>

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

@@ -96,7 +96,12 @@
                 message: '请输入姓名',
                 trigger: 'blur'
               }
-            ]
+            ],
+            contact: [{
+              pattern: /^1[3456789]\d{9}$/,
+              message: '请输入正确的手机号码',
+              trigger: 'blur'
+            },]
           }
 
       }

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

@@ -13,7 +13,7 @@
               </el-upload>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="物料名称" prop="materialId">
               <popupSelect v-model="dataForm.materialId" placeholder="请选择物料编码" clearable field="materialId"
                 interfaceId="381037852907038533" :columnOptions="materialIdcolumnOptions" propsValue="id"
@@ -23,7 +23,7 @@
               </popupSelect>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="客户名称" prop="customerId">
               <popupSelect v-model="dataForm.customerId" placeholder="请选择客户" clearable field="customerId"
                 interfaceId="395936123471343749" :columnOptions="customerIdcolumnOptions" propsValue="id"
@@ -33,7 +33,7 @@
               </popupSelect>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="销售合同" prop="salesId">
               <popupSelect v-model="dataForm.salesId" placeholder="请选择合同" clearable field="salesId"
                 interfaceId="396203872441416837" :columnOptions="salesIdcolumnOptions" propsValue="id"
@@ -43,7 +43,7 @@
               </popupSelect>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="车牌号" prop="vehicleId">
               <popupSelect v-model="dataForm.vehicleId" placeholder="请选择车辆" clearable field="vehicleId"
                 interfaceId="381432451370615173" :columnOptions="vehicleIdcolumnOptions" propsValue="id"
@@ -60,7 +60,7 @@
               </JNPF-UploadImg>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="磅单时间" prop="poundDate">
               <el-date-picker v-model="dataForm.poundDate" placeholder="请选择" clearable :style='{"width":"100%"}'
                 type="date" format="yyyy-MM-dd" value-format="timestamp">
@@ -68,52 +68,51 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="磅单号" prop="poundlistNo">
               <el-input v-model="dataForm.poundlistNo" placeholder="请输入" clearable :style='{"width":"100%"}'>
 
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
+            <el-form-item label="单位 " prop="unit">
+              <el-select v-model="unit" placeholder="请选择" clearable :style='{"width":"100%"}' @change="unitChange">
+                <el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id"
+                           :disabled="item.disabled"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="运输类型" prop="transportType">
+              <el-select v-model="transportType" placeholder="请选择" clearable :style='{"width":"100%"}' @change="transportTypeChange">
+                <el-option v-for="(item, index) in transportTypeOptions" :key="index" :label="item.fullName"
+                           :value="item.id" :disabled="item.disabled"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="皮重" prop="tareWeight">
               <el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}'></el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="毛重" prop="grossWeight">
               <el-input-number v-model="dataForm.grossWeight" :style='{"width":"100%"}'></el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="扣重" prop="buckleWeight">
               <el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}'></el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="净重" prop="netWeight">
               <el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}'></el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="单位 " prop="unit">
-              <el-select v-model="unit" placeholder="请选择" clearable :style='{"width":"100%"}' @change="unitChange">
-                <el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id"
-                  :disabled="item.disabled"></el-option>
 
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="运输类型" prop="transportType">
-              <el-select v-model="transportType" placeholder="请选择" clearable :style='{"width":"100%"}' @change="transportTypeChange">
-                <el-option v-for="(item, index) in transportTypeOptions" :key="index" :label="item.fullName"
-                  :value="item.id" :disabled="item.disabled"></el-option>
-
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="是否垫资" prop="advance">
               <el-select v-model="advance" placeholder="请选择" clearable :style='{"width":"100%"}' @change="advanceChange">
                 <el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName" :value="item.id"
@@ -122,17 +121,26 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="运费" prop="transportPrice">
               <el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}'></el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+
+
+          <el-col :span="6">
+            <el-form-item label="起始地" prop="originPlace">
+              <el-input v-model="dataForm.originPlace" placeholder="请输入起始地" clearable :style='{"width":"100%"}'>
+              </el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
             <el-form-item label="销售价格" prop="salesPrice">
               <el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}'></el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="业务员" prop="businessId">
               <popupSelect v-model="dataForm.businessId" placeholder="请选择业务员" clearable field="businessId"
                 interfaceId="ebcc44be142e43b795c0d769abd6d25a" :columnOptions="businessIdcolumnOptions"
@@ -142,7 +150,7 @@
               </popupSelect>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="自然人" prop="naturalId">
               <popupSelect v-model="dataForm.naturalId" placeholder="请选择自然人" clearable field="naturalId"
                 interfaceId="395933800510599301" :columnOptions="naturalIdcolumnOptions" propsValue="id"
@@ -151,7 +159,7 @@
               </popupSelect>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="dataForm.remark" placeholder="请输入备注信息" clearable :style='{"width":"100%"}'>
 
@@ -208,6 +216,7 @@
           transportType: "0",
           advance: "0",
           transportPrice: 0,
+          originPlace:"",
           salesPrice: 0,
           businessId: "",
           naturalId: "",

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

@@ -17,6 +17,17 @@
               <el-input v-model="query.poundlistNo" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="车牌号">
+              <el-input v-model="query.vehicleId" placeholder="请输入" clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="物料名称">
+              <el-input v-model="query.materialId" placeholder="请输入" clearable></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="6">
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
@@ -82,6 +93,8 @@
 
           <el-table-column prop="transportPrice" label="运费" width="150" align="center" sortable
           />
+          <el-table-column prop="originPlace" label="起始地" width="150" align="center" sortable
+          />
           <el-table-column prop="salesPrice" label="销售价格" width="150" align="center" sortable
           />
           <el-table-column prop="businessId" label="业务员" width="120" align="center" sortable
@@ -163,7 +176,9 @@
         detailVisible: false,
         query: {
           poundDate: undefined,
-          poundlistNo: undefined
+          poundlistNo: undefined,
+          vehicleId: undefined,
+          materialId: undefined,
         },
         treeProps: {
           children: 'children',
@@ -195,6 +210,7 @@
           { prop: 'advance', label: '是否垫资' },
           { prop: 'transportType', label: '运输类型' },
           { prop: 'transportPrice', label: '运费' },
+          { prop: 'originPlace', label: '起始地' },
           { prop: 'salesPrice', label: '销售价格' },
           { prop: 'creatorUserName', label: '业务员' },
           { prop: 'remark', label: '备注' }