修改合同换位置

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -1888,4 +1888,7 @@
   .inline-input {
     width: 100%;
   }
+  .typeselect{
+    width: 100%;
+  }
 </style>

src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -1968,4 +1968,7 @@ export default {
   width: 100%;
   text-align: left;
 }
+  .typeselect{
+    width: 100%;
+  }
 </style>

src/views/contractManagement/purchaseContractAdd.vue

@@ -42,11 +42,7 @@
           <el-radio v-model="deptBudgetList.agreementType" label="采购合同">采购合同</el-radio>
           <el-radio v-model="deptBudgetList.agreementType" label="补充协议">补充协议</el-radio>
         </ws-form-item>
-        <!--合同编号-->
-        <ws-form-item label="合同编号" span="1" v-show="deptBudgetList.agreementType == '采购合同'" prop="contractNo"
-          class="readonly" required>
-          <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small" />
-        </ws-form-item>
+
         <!--关联合同-->
         <ws-form-item prop="agreementNo" label="关联合同" span="1" v-show="deptBudgetList.agreementType =='补充协议'">
           <ws-select v-model="deptBudgetList.agreementNo" placeholder="请选择编号" @change="selectRelation">
@@ -54,7 +50,7 @@
               :value="item.contractNo"></ws-option>
           </ws-select>
         </ws-form-item>
-        <!--补充协议编号-->
+        <!-- 补充协议编号 -->
         <ws-form-item v-show="deptBudgetList.agreementType == '补充协议'" label="补充协议编号" span="1" prop="contractNo">
           <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入补充协议编号" maxlength="100" size="small" />
         </ws-form-item>
@@ -62,33 +58,31 @@
         <ws-form-item label="运输方式" span="1" prop="shippingType">
           <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="100" size="small" />
         </ws-form-item>
-        <!--买方-->
-        <ws-form-item label="买方" span="1" prop="buyer" class="readonly">
-          <!-- <ws-input v-model="deptBudgetList.buyer" placeholder="请输入买方名称" maxlength="100" size="small" /> -->
-          <el-autocomplete class="inline-input" v-model="deptBudgetList.buyer" :fetch-suggestions="querySearch1"
-            placeholder="请输入买方名称" @select="handleSelect"></el-autocomplete>
+
+        <!--合同编号-->
+        <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly" required>
+          <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small" />
         </ws-form-item>
 
         <!--结算方式-->
         <ws-form-item label="结算方式" span="1" prop="settlementMethod">
           <ws-input v-model="deptBudgetList.settlementMethod" placeholder="请输入结算方式" maxlength="100" size="small" />
         </ws-form-item>
-
-        <!--卖方-->
-        <ws-form-item label="卖方" span="1" prop="seller" class="readonly">
-          <!-- <ws-input v-model="deptBudgetList.seller" placeholder="请输入卖方名称" maxlength="100" size="small" /> -->
-          <el-autocomplete class="inline-input" v-model="deptBudgetList.seller" :fetch-suggestions="querySearch2"
-            placeholder="请输入卖方名称" @select="handleSelect"></el-autocomplete>
+        <ws-form-item label="买方" span="1" prop="buyer" class="readonly">
+          <!-- <ws-input v-model="deptBudgetList.buyer" placeholder="请输入买方名称" maxlength="100" size="small" /> -->
+          <el-autocomplete class="inline-input" v-model="deptBudgetList.buyer" :fetch-suggestions="querySearch1"
+            placeholder="请输入买方名称" @select="handleSelect"></el-autocomplete>
         </ws-form-item>
+        <!--卖方-->
+
         <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
           <el-radio v-model="deptBudgetList.deliverType" label="1">我方自提</el-radio>
           <el-radio v-model="deptBudgetList.deliverType" label="2">对方送货</el-radio>
         </ws-form-item>
-        <!--买方电话-->
-        <ws-form-item label="买方电话" span="1" prop="contractNo">
-          <!-- <ws-input v-model.number="deptBudgetList.buyerPhone" placeholder="请输入买方电话" maxlength="100" size="small" /> -->
-          <el-autocomplete class="inline-input" v-model="deptBudgetList.buyerPhone" :fetch-suggestions="querySearch3"
-            placeholder="请输入买方电话" @select="handleSelect"></el-autocomplete>
+        <ws-form-item label="卖方" span="1" prop="seller" class="readonly">
+          <!-- <ws-input v-model="deptBudgetList.seller" placeholder="请输入卖方名称" maxlength="100" size="small" /> -->
+          <el-autocomplete class="inline-input" v-model="deptBudgetList.seller" :fetch-suggestions="querySearch2"
+            placeholder="请输入卖方名称" @select="handleSelect"></el-autocomplete>
         </ws-form-item>
         <!--包装方式-->
         <ws-form-item label="包装方式" span="1" prop="packingMethod">
@@ -98,12 +92,14 @@
               :value="item.constValue" />
           </ws-select>
         </ws-form-item>
-        <!--卖方电话-->
-        <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
-          <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" /> -->
-          <el-autocomplete class="inline-input" v-model="deptBudgetList.sellerPhone" :fetch-suggestions="querySearch4"
-            placeholder="请输入卖方电话" @select="handleSelect"></el-autocomplete>
+
+        <!--买方电话-->
+        <ws-form-item label="买方电话" span="1" prop="contractNo">
+          <!-- <ws-input v-model.number="deptBudgetList.buyerPhone" placeholder="请输入买方电话" maxlength="100" size="small" /> -->
+          <el-autocomplete class="inline-input" v-model="deptBudgetList.buyerPhone" :fetch-suggestions="querySearch3"
+            placeholder="请输入买方电话" @select="handleSelect"></el-autocomplete>
         </ws-form-item>
+
         <!--验收方式-->
         <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
           <el-select v-model="deptBudgetList.acceptanceMethod" placeholder="请选择验收方式" style="width: 100%" filterable
@@ -142,6 +138,12 @@
             </el-option>
           </el-select>
         </ws-form-item>
+        <!--卖方电话-->
+        <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
+          <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" /> -->
+          <el-autocomplete class="inline-input" v-model="deptBudgetList.sellerPhone" :fetch-suggestions="querySearch4"
+            placeholder="请输入卖方电话" @select="handleSelect"></el-autocomplete>
+        </ws-form-item>
         <!--重量（吨）-->
         <ws-form-item label="重量（吨）" span="1" prop="weight">
           <ws-input @input="weightchange" v-model="deptBudgetList.weight" placeholder="请输入重量（吨）" maxlength="100"
@@ -171,6 +173,12 @@
         <ws-form-item label="合同总价" span="1" prop="totalContractPrice">
           <ws-input v-model="deptBudgetList.totalContractPrice" placeholder="请输入合同总价" maxlength="100" size="small" />
         </ws-form-item>
+
+        <!--签订日期-->
+        <ws-form-item label="签订日期" span="1" prop="signingDate">
+          <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
+            value-format="yyyy-MM-dd" />
+        </ws-form-item>
         <ws-form-item label="货源所在地区" span="1" prop="sourceGoods">
           <!-- <el-cascader
             :options="options_"
@@ -205,24 +213,20 @@
         <ws-form-item label="交货详细地址" span="1" prop="placeDelivery">
           <ws-input v-model="deptBudgetList.placeDelivery" placeholder="请输入交货详细地址" maxlength="20" size="small" />
         </ws-form-item>
-        <!--签订日期-->
-        <ws-form-item label="签订日期" span="1" prop="signingDate">
-          <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
-            value-format="yyyy-MM-dd" />
-        </ws-form-item>
         <ws-form-item label="最终实际成交量（吨）" span="1" prop="finalTradingVolume">
           <ws-input v-model="deptBudgetList.finalTradingVolume" placeholder="请输入最终实际成交量" maxlength="100" size="small" />
         </ws-form-item>
+        <ws-form-item label="结算重量方式" span="1" prop="settlementWeightMethod" class="readonly"
+          v-if="deptBudgetList.deliverType==1">
+          <el-radio v-model="deptBudgetList.settlementWeightMethod" label="1">按出库重量结算</el-radio>
+          <el-radio v-model="deptBudgetList.settlementWeightMethod" label="2">按入库重量结算</el-radio>
+        </ws-form-item>
         <ws-form-item v-show="deptBudgetList.deliverType == 1" label="临时仓库负责人" span="1" prop="packingMethod">
           <el-select v-model="deptBudgetList.personCharge" placeholder="请选择临时仓库负责人" filterable clearable
-             @change="selectstaff">
+            @change="selectstaff">
             <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
           </el-select>
         </ws-form-item>
-          <ws-form-item label="结算重量方式" span="1" prop="settlementWeightMethod" class="readonly" v-if="deptBudgetList.deliverType==1">
-          <el-radio v-model="deptBudgetList.settlementWeightMethod" label="1">按出库重量结算</el-radio>
-          <el-radio v-model="deptBudgetList.settlementWeightMethod" label="2">按入库重量结算</el-radio>
-        </ws-form-item>
       </ws-info-table>
       <div class="wenzi">
         <h3>货物信息</h3>
@@ -335,7 +339,8 @@
       <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过3000字"
         maxlength="3000" />
       <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
-        @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`"/>
+        @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+        v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`" />
     </ws-form>
     <div v-if="dialogVisible" class="map">
       <map-drag @marker="marker" :isShowaddress='true' v-on:addressListen='getAddress' :type="type"></map-drag>
@@ -456,7 +461,7 @@
           contractProcessInfo: {},
           sourceGoods: '',
           placeDelivery: '',
-          settlementWeightMethod:'1',
+          settlementWeightMethod: '1',
         },
         acceptanceCheck: {},
         pickerBeginDateBefore: {
@@ -684,10 +689,12 @@
             this.deptBudgetList.agreementNo = this.contractNoList[i].contractNo
             this.deptBudgetList.contractNo = this.contractNoList[i].contractNo
             this.deptBudgetList.agreementType = '补充协议'
-            this.newSelectedOptions = this.contractNoList[i].sourceProvince+this.contractNoList[i].sourceCity+this.contractNoList[i].sourceArea
-            this.deptBudgetList.sourceGoods =  this.contractNoList[i].sourceGoods
-            this.newSelectedOptions1 = this.contractNoList[i].deliveryProvince+this.contractNoList[i].deliveryCity+this.contractNoList[i].deliveryArea
-            this.deptBudgetList.placeDelivery =  this.contractNoList[i].placeDelivery
+            this.newSelectedOptions = this.contractNoList[i].sourceProvince + this.contractNoList[i].sourceCity + this
+              .contractNoList[i].sourceArea
+            this.deptBudgetList.sourceGoods = this.contractNoList[i].sourceGoods
+            this.newSelectedOptions1 = this.contractNoList[i].deliveryProvince + this.contractNoList[i].deliveryCity +
+              this.contractNoList[i].deliveryArea
+            this.deptBudgetList.placeDelivery = this.contractNoList[i].placeDelivery
           }
         }
       },

src/views/contractManagement/salesContractAdd.vue

@@ -12,13 +12,13 @@
     </el-row>
     <div class="center">
       <ws-form ref="deptBudgetList" :model="deptBudgetList">
-      <div class="remark">
-        <h3>基本信息</h3>
-        <p style="color: #8890b1">
+        <div class="remark">
+          <h3>基本信息</h3>
+          <p style="color: #8890b1">
             &nbsp;&nbsp;注：基本信息和货物信息均为必填项，“<span style="color:red">*</span>”
             标记的条目提交后不可修改。
           </p>
-      </div>
+        </div>
         <!--基本信息-->
         <ws-info-table>
           <!--合同类型-->
@@ -27,8 +27,8 @@
             <el-radio v-model="deptBudgetList.agreementType" label="补充协议">补充协议</el-radio>
           </ws-form-item>
           <!--合同编号-->
-          <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly"
-            v-if="deptBudgetList.agreementType == '销售合同'">
+          <!-- v-if="deptBudgetList.agreementType == '销售合同'" -->
+          <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly">
             <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small"
               :rules="ruleDeptBudget" />
           </ws-form-item>
@@ -45,19 +45,15 @@
             <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入补充协议编号" maxlength="50" size="small"
               :rules="ruleDeptBudget" />
           </ws-form-item>
-          <!--运输方式-->
-          <ws-form-item label="运输方式" span="1" prop="shippingType">
-            <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="20" size="small" />
-          </ws-form-item>
           <!--买方-->
           <ws-form-item label="买方" span="1" prop="buyer" class="readonly">
             <!-- <ws-input v-model="deptBudgetList.buyer" placeholder="请输入买方名称" maxlength="100" size="small" /> -->
             <el-autocomplete class="inline-input" v-model="deptBudgetList.buyer" :fetch-suggestions="querySearch1"
               placeholder="请输入买方名称" @select="handleSelect"></el-autocomplete>
           </ws-form-item>
-          <!--结算方式-->
-          <ws-form-item label="结算方式" span="1" prop="settlementMethod">
-            <ws-input v-model="deptBudgetList.settlementMethod" placeholder="请输入结算方式" maxlength="120" size="small" />
+          <!--运输方式-->
+          <ws-form-item label="运输方式" span="1" prop="shippingType">
+            <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="20" size="small" />
           </ws-form-item>
           <!--卖方-->
           <ws-form-item label="卖方" span="1" prop="seller" class="readonly">
@@ -65,18 +61,31 @@
             <el-autocomplete class="inline-input" v-model="deptBudgetList.seller" :fetch-suggestions="querySearch2"
               placeholder="请输入卖方名称" @select="handleSelect"></el-autocomplete>
           </ws-form-item>
-          <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
-            <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="1">我方送货</el-radio>
-            <el-radio v-model="deptBudgetList.deliverType" v-else label="1">我方送货</el-radio>
-            <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="2">对方自提</el-radio>
-            <el-radio v-model="deptBudgetList.deliverType" v-else label="2">对方自提</el-radio>
+          <!--结算方式-->
+          <ws-form-item label="结算方式" span="1" prop="settlementMethod">
+            <ws-input v-model="deptBudgetList.settlementMethod" placeholder="请输入结算方式" maxlength="120" size="small" />
           </ws-form-item>
+
           <!--买方电话-->
           <ws-form-item label="买方电话" span="1" prop="contractNo">
             <!-- <ws-input v-model.number="deptBudgetList.buyerPhone" placeholder="请输入买方电话" maxlength="100" size="small" /> -->
             <el-autocomplete class="inline-input" v-model="deptBudgetList.buyerPhone" :fetch-suggestions="querySearch3"
               placeholder="请输入买方电话" @select="handleSelect"></el-autocomplete>
           </ws-form-item>
+          <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
+            <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="1">
+              我方送货</el-radio>
+            <el-radio v-model="deptBudgetList.deliverType" v-else label="1">我方送货</el-radio>
+            <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="2">
+              对方自提</el-radio>
+            <el-radio v-model="deptBudgetList.deliverType" v-else label="2">对方自提</el-radio>
+          </ws-form-item>
+          <!--卖方电话-->
+          <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
+            <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" /> -->
+            <el-autocomplete class="inline-input" v-model="deptBudgetList.sellerPhone" :fetch-suggestions="querySearch4"
+              placeholder="请输入卖方电话" @select="handleSelect"></el-autocomplete>
+          </ws-form-item>
           <!--包装方式-->
           <ws-form-item label="包装方式" span="1" prop="packingMethod">
             <ws-select v-model="deptBudgetList.packingMethod" placeholder="" class="typeselect"
@@ -85,16 +94,15 @@
                 :value="item.constValue" />
             </ws-select>
           </ws-form-item>
-          <!--卖方电话-->
-          <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
-            <!-- <ws-input v-model="deptBudgetList.sellerPhone" placeholder="请输入卖方电话" maxlength="100" size="small" /> -->
-            <el-autocomplete class="inline-input" v-model="deptBudgetList.sellerPhone" :fetch-suggestions="querySearch4"
-              placeholder="请输入卖方电话" @select="handleSelect"></el-autocomplete>
+          <!--重量（吨）-->
+          <ws-form-item label="重量（吨）" span="1" prop="weight">
+            <ws-input @input="weightchange" v-model="deptBudgetList.weight" placeholder="请输入重量（吨）" maxlength="100"
+              size="small" />
           </ws-form-item>
           <!--验收方式-->
           <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
-            <el-select v-model="deptBudgetList.acceptanceMethod" placeholder="请选择验收方式" style="width: 100%" clearable filterable
-              @change="selectunitList">
+            <el-select v-model="deptBudgetList.acceptanceMethod" placeholder="请选择验收方式" style="width: 100%" clearable
+              filterable @change="selectunitList">
               <el-option v-for="(item, index) in unitList" :key="item.constValue" :label="item.constValue"
                 :value="item.constValue">
                 <span class="unit-left" style="float: left">
@@ -130,11 +138,6 @@
               </el-option>
             </el-select>
           </ws-form-item>
-          <!--重量（吨）-->
-          <ws-form-item label="重量（吨）" span="1" prop="weight">
-            <ws-input @input="weightchange" v-model="deptBudgetList.weight" placeholder="请输入重量（吨）" maxlength="100"
-              size="small" />
-          </ws-form-item>
           <!--交货日期（起）-->
           <ws-form-item label="交货日期（起）" span="1" prop="deliveryDateStart">
             <ws-date-picker v-model="deptBudgetList.deliveryDateStart" type="date" placeholder="请选择交货日期（起）"
@@ -333,13 +336,9 @@
         <!--备注信息-->
         <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过200字"
           maxlength="3000" />
-        <ws-upload ref="upload" 
-        :comp-id="compId" 
-        :appendix-ids="deptBudgetList.addressUrl" 
-        :size-limit="size"
-        @onChange="onChange" 
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" 
-        v-hasPermission="`contractManagement.salesContract.salesContractInfo.appl`"/>
+        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
+          @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+          v-hasPermission="`contractManagement.salesContract.salesContractInfo.appl`" />
       </ws-form>
       <div v-if="dialogVisible" class="map">
         <map-drag @marker="marker" :isShowaddress="true" v-on:addressListen="getAddress" :type="type">
@@ -620,10 +619,12 @@
             this.deptBudgetList.agreementNo = this.contractNoList[i].contractNo
             this.deptBudgetList.contractNo = this.contractNoList[i].contractNo
             this.deptBudgetList.agreementType = '补充协议'
-            this.newSelectedOptions = this.contractNoList[i].sourceProvince+this.contractNoList[i].sourceCity+this.contractNoList[i].sourceArea
-            this.deptBudgetList.sourceGoods =  this.contractNoList[i].sourceGoods
-            this.newSelectedOptions1 = this.contractNoList[i].deliveryProvince+this.contractNoList[i].deliveryCity+this.contractNoList[i].deliveryArea
-            this.deptBudgetList.placeDelivery =  this.contractNoList[i].placeDelivery
+            this.newSelectedOptions = this.contractNoList[i].sourceProvince + this.contractNoList[i].sourceCity + this
+              .contractNoList[i].sourceArea
+            this.deptBudgetList.sourceGoods = this.contractNoList[i].sourceGoods
+            this.newSelectedOptions1 = this.contractNoList[i].deliveryProvince + this.contractNoList[i].deliveryCity +
+              this.contractNoList[i].deliveryArea
+            this.deptBudgetList.placeDelivery = this.contractNoList[i].placeDelivery
           }
         }
       },
@@ -1439,7 +1440,7 @@
         }
       },
       selectpriceType(e) {
-        if(e=='随行就市'){
+        if (e == '随行就市') {
           this.deptBudgetList.deliverType = '1'
         }
       },