暂存

src/Form/EnterpriseArchives/add.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="onShow">新 建</el-button>
-    <el-drawer title="新建档案" direction="rtl" append-to-body :visible.sync="dialogFormVisible">
+    <el-drawer title="新建档案" direction="rtl" append-to-body :visible.sync="dialogFormVisible" :show-close="false" size="600px">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">

src/Form/EnterpriseArchives/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" :type="btnType?btnType:'text'" @click="onShow">编 辑</el-button>
-    <el-drawer title="编辑档案" direction="rtl" append-to-body :visible.sync="dialogFormVisible">
+    <el-drawer title="编辑档案" direction="rtl" append-to-body :visible.sync="dialogFormVisible" :show-close="false" size="600px">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">

src/HDrpManagement/contractManage/components/contractClause/contractClause.vue

@@ -2,112 +2,128 @@
   <div>
     <div>
       <div class="flex-align-center" style="margin-bottom:20px">
-<!--        <el-button size="small" slot="reference" class="inline-16" type="warning" :disabled="disabled" >编 辑</el-button>-->
-        <el-button size="small" slot="reference" class="inline-16" type="warning" :disabled="disabled" >保 存</el-button>
+        <el-button v-if="editShow" size="small" slot="reference" class="inline-16" type="primary" :disabled="disabled" @click="editClick">编 辑</el-button>
+        <el-button v-if="saveShow" size="small" slot="reference" class="inline-16" type="warning" :disabled="disabled" >保 存</el-button>
         <el-popconfirm title="确定重置当前合同吗？" @confirm="reset()">
-          <el-button size="small" slot="reference" class="inline-16" :disabled="disabled" >重 置</el-button>
+          <el-button v-if="saveShow" size="small" slot="reference" class="inline-16" :disabled="disabled" >重 置</el-button>
         </el-popconfirm>
       </div>
     </div>
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <div style="margin-bottom: 20px" >
+          <el-descriptions title="合同条款" :column="1" border labelClassName="my-label" contentClassName="my-content" style="font-size: 15px" >
+            <el-descriptions-item label="压力等级" label-class-name="my-label" content-class-name="my-content">
+              <el-input v-model="form.dataextend.pressure" placeholder="未做特殊备注,请填写压力等级" :disabled="editShow"></el-input>
+            </el-descriptions-item>
+            <el-descriptions-item label="运输费承担方">
+              <el-select v-model="freightpayer" placeholder="请选择" style="width: 100%" :disabled="editShow">
+                <el-option
+                    v-for="item in freightpayerList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                </el-option>
+              </el-select>
+            </el-descriptions-item>
+            <el-descriptions-item label="交货方式">
+              <el-select v-model="form.deliverymode" placeholder="请选择" style="width: 100%" :disabled="editShow">
+                <el-option
+                    v-for="item in deliverymodeList"
+                    :key="item.rowindex"
+                    :label="item.value"
+                    :value="item.value">
+                </el-option>
+              </el-select>
+            </el-descriptions-item>
+            <el-descriptions-item label="付款方式">
+              <template slot="label">
+                <span style="color: red">*</span>
+                付款方式
+              </template>
+              <el-select v-model="form.paytype" placeholder="请选择" style="width: 100%" :disabled="editShow">
+                <el-option
+                    v-for="item in paytypeList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                </el-option>
+              </el-select>
+            </el-descriptions-item>
+            <el-descriptions-item label="付款方式(合同条款)">
+              <el-input v-model="clause[0].value" placeholder="请填写" style="margin-bottom: 10px" :disabled="editShow"></el-input>
+              <el-input v-model="clause[1].value" placeholder="请填写" style="margin-bottom: 10px" :disabled="editShow"></el-input>
+              <el-input v-model="clause[2].value" placeholder="请填写" style="margin-bottom: 10px" :disabled="editShow"></el-input>
+              <el-input v-model="clause[3].value" placeholder="请填写" :disabled="editShow"></el-input>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </el-col>
+    </el-row>
 
-    <div style="width: 49%;margin-bottom: 20px">
-      <el-descriptions title="合同条款" :column="1" border labelClassName="my-label" contentClassName="my-content" style="font-size: 15px" >
-        <el-descriptions-item label="压力等级" label-class-name="my-label" content-class-name="my-content">
-          <el-input v-model="form.dataextend.pressure" placeholder="未做特殊备注,请填写压力等级"></el-input>
-        </el-descriptions-item>
-        <el-descriptions-item label="运输费承担方">
-          <el-select v-model="freightpayer" placeholder="请选择" style="width: 100%">
-            <el-option
-                v-for="item in freightpayerList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-            </el-option>
-          </el-select>
-        </el-descriptions-item>
-        <el-descriptions-item label="交货方式">
-          <el-select v-model="form.deliverymode" placeholder="请选择" style="width: 100%">
-            <el-option
-                v-for="item in deliverymodeList"
-                :key="item.rowindex"
-                :label="item.value"
-                :value="item.value">
-            </el-option>
-          </el-select>
-        </el-descriptions-item>
-        <el-descriptions-item label="付款方式">
-          <el-select v-model="form.paytype" placeholder="请选择" style="width: 100%">
-            <el-option
-                v-for="item in paytypeList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-            </el-option>
-          </el-select>
-        </el-descriptions-item>
-        <el-descriptions-item label="付款方式(合同条款)">
-          <el-input v-model="clause[0].value" placeholder="请填写" style="margin-bottom: 10px"></el-input>
-          <el-input v-model="clause[1].value" placeholder="请填写" style="margin-bottom: 10px"></el-input>
-          <el-input v-model="clause[2].value" placeholder="请填写" style="margin-bottom: 10px"></el-input>
-          <el-input v-model="clause[3].value" placeholder="请填写" ></el-input>
-        </el-descriptions-item>
-      </el-descriptions>
-    </div>
     <div style="width: 100%" class="inline-16">
       <el-descriptions title="落款信息" :column="1" border labelClassName="my-label" contentClassName="my-content" style="font-size: 15px">
       </el-descriptions>
     </div>
-    <div style="width: 49%" class="inline-24">
-      <el-descriptions title="" :column="1" border labelClassName="my-label" contentClassName="my-content" style="font-size: 15px;margin-bottom: 10px">
-        <el-descriptions-item label="乙方(需方)" label-class-name="my-label" content-class-name="my-content">
-          <el-input v-model="input" placeholder="请填写"></el-input>
-        </el-descriptions-item>
-        <el-descriptions-item label="税号">
-          <el-input v-model="form.parta.taxno" placeholder="请填写"></el-input>
-        </el-descriptions-item>
-        <el-descriptions-item label="开户银行">
-          <el-input v-model="form.parta.bank" placeholder="请填写"></el-input>
-        </el-descriptions-item>
-        <el-descriptions-item label="开户账号">
-          <el-input v-model="form.parta.bankcardno" placeholder="请填写"></el-input>
-        </el-descriptions-item>
-        <el-descriptions-item label="地址">
-          <el-input v-model="form.parta.address" placeholder="请填写"></el-input>
-        </el-descriptions-item>
-        <el-descriptions-item label="电话">
-          <el-input v-model="form.parta.phonenumber" placeholder="请填写"></el-input>
-        </el-descriptions-item>
-        <el-descriptions-item label="法人">
-          <el-input v-model="form.parta.contact" placeholder="请填写"></el-input>
-        </el-descriptions-item>
-      </el-descriptions>
-    </div>
+    <el-row :gutter="20">
+      <el-col :span="12">
+        <div >
+          <el-descriptions title="" :column="1" border labelClassName="my-label" contentClassName="my-content" style="font-size: 15px;margin-bottom: 10px">
+            <el-descriptions-item label="乙方(需方)" label-class-name="my-label" content-class-name="my-content">
+              <el-input v-model="form.partb.enterprisename" placeholder="请填写" :disabled="editShow"></el-input>
+            </el-descriptions-item>
+            <el-descriptions-item label="税号">
+              <el-input v-model="form.partb.taxno" placeholder="请填写" :disabled="editShow"></el-input>
+            </el-descriptions-item>
+            <el-descriptions-item label="开户银行">
+              <el-input v-model="form.partb.bank" placeholder="请填写" :disabled="editShow"></el-input>
+            </el-descriptions-item>
+            <el-descriptions-item label="开户账号">
+              <el-input v-model="form.partb.bankcardno" placeholder="请填写" :disabled="editShow"></el-input>
+            </el-descriptions-item>
+            <el-descriptions-item label="地址">
+              <el-input v-model="form.partb.address" placeholder="请填写" :disabled="editShow"></el-input>
+            </el-descriptions-item>
+            <el-descriptions-item label="电话">
+              <el-input v-model="form.partb.phonenumber" placeholder="请填写" :disabled="editShow"></el-input>
+            </el-descriptions-item>
+            <el-descriptions-item label="法人">
+              <el-input v-model="form.partb.contact" placeholder="请填写" :disabled="editShow"></el-input>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </el-col>
+      <el-col :span="12">
+        <div  >
+          <el-descriptions title="" :column="1" border labelClassName="my-label" contentClassName="my-content" style="font-size: 15px;margin-bottom: 10px">
+            <el-descriptions-item label="甲方(供方)" label-class-name="my-label" content-class-name="my-content">
+              <el-input v-model="form.parta.enterprisename" placeholder="请填写" disabled></el-input>
+            </el-descriptions-item>
+            <el-descriptions-item label="税号">
+              <el-input v-model="form.parta.taxno" placeholder="请填写" disabled></el-input>
+            </el-descriptions-item>
+            <el-descriptions-item label="开户银行">
+              <el-input v-model="form.parta.bank" placeholder="请填写" disabled></el-input>
+            </el-descriptions-item>
+            <el-descriptions-item label="开户账号">
+              <el-input v-model="form.parta.bankcardno" placeholder="请填写" disabled></el-input>
+            </el-descriptions-item>
+            <el-descriptions-item label="地址">
+              <el-input v-model="form.parta.address" placeholder="请填写" disabled></el-input>
+            </el-descriptions-item>
+            <el-descriptions-item label="电话">
+              <el-input v-model="form.parta.phonenumber" placeholder="请填写" disabled></el-input>
+            </el-descriptions-item>
+            <el-descriptions-item label="法人">
+              <el-input v-model="form.parta.contact" placeholder="请填写" disabled></el-input>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </el-col>
+    </el-row>
+
+
 
-    <div style="width: 49%;display: inline-block !important;" >
-      <el-descriptions title="" :column="1" border labelClassName="my-label" contentClassName="my-content" style="font-size: 15px;margin-bottom: 10px">
-        <el-descriptions-item label="甲方(供方)" label-class-name="my-label" content-class-name="my-content">
-          <el-input v-model="input" placeholder="请填写"></el-input>
-        </el-descriptions-item>
-        <el-descriptions-item label="税号">
-          <el-input v-model="form.partb.taxno" placeholder="请填写"></el-input>
-        </el-descriptions-item>
-        <el-descriptions-item label="开户银行">
-          <el-input v-model="form.partb.bank" placeholder="请填写"></el-input>
-        </el-descriptions-item>
-        <el-descriptions-item label="开户账号">
-          <el-input v-model="form.partb.bankcardno" placeholder="请填写"></el-input>
-        </el-descriptions-item>
-        <el-descriptions-item label="地址">
-          <el-input v-model="form.partb.address" placeholder="请填写"></el-input>
-        </el-descriptions-item>
-        <el-descriptions-item label="电话">
-          <el-input v-model="form.partb.phonenumber" placeholder="请填写"></el-input>
-        </el-descriptions-item>
-        <el-descriptions-item label="法人">
-          <el-input v-model="form.partb.contact" placeholder="请填写"></el-input>
-        </el-descriptions-item>
-      </el-descriptions>
-    </div>
 
 
 
@@ -116,21 +132,23 @@
 
 <script>
 export default {
-  props:['disabled'],
+  props:['disabled','sys_enterpriseid'],
   components: {},
   name: '',
   data() {
     return {
       input:'',
+      saveShow:false,
+      editShow:true,
       form: {
         "sa_contractid": 2,
         "dataextend": {
           "pressure": "" //压力等级
         },
         "deliverymode": "", //交货方式
-        "paytype": "", //付款方式
+        "paytype": "1", //付款方式
         "parta": {
-          "taxno": "1",
+          "taxno": "",
           "bank": "",
           "bankcardno": "",
           "address": "",
@@ -139,7 +157,7 @@ export default {
           "freightpayer": 0 //运输费承担方
         },
         "partb": {
-          "taxno": "2",
+          "taxno": "",
           "bank": "",
           "bankcardno": "",
           "address": "",
@@ -198,8 +216,10 @@ export default {
   },
   mounted() {
     this.queryDeliverymode()
+    this.queryContractTerms()
   },
   methods: {
+    /*获取交货方式*/
     async queryDeliverymode(){
       const res = await this.$api.requested({
         classname: "sysmanage.develop.optiontype.optiontype",
@@ -213,6 +233,28 @@ export default {
       })
       this.deliverymodeList = res.data
       this.form.paytype = this.paytypeList[0].value
+    },
+    /*查询合同条款*/
+    async queryContractTerms(){
+      const res = await this.$api.requested({
+        "id": 20230117112102,
+        "content": {
+          "sa_contractid": this.$route.query.id,
+          "sys_enterpriseid":this.sys_enterpriseid
+        },
+      })
+      this.form = Object.assign({},this.form,res.data)
+      if (this.form.paytype === ''){
+        this.form.paytype = this.paytypeList[0].value
+      }
+    },
+    submit(){
+      this.editShow = true
+      this.saveShow = false
+    },
+    editClick(){
+      this.editShow = false
+      this.saveShow = true
     }
   },
 };

src/HDrpManagement/contractManage/modules/detail.vue

@@ -95,7 +95,7 @@
           </template>
         </productClassList>
         <!--合同条款-->
-        <contractClause :disabled="mainData.status != '新建' || !isLeader" ref="Claus" v-if="mainData.type == '项目' || mainData.type == '工具借用'">
+        <contractClause :sys_enterpriseid="mainData.sys_enterpriseid" :disabled="mainData.status != '新建' || !isLeader" ref="Claus" v-if="mainData.type == '项目' || mainData.type == '工具借用'">
 <!--          <el-button
             v-if="tool.checkAuth($route.name,'contractClauseManage')"
             size="small" 

src/HManagement/siteManage/securityConfig/modules/edit.vue

@@ -121,7 +121,7 @@ export default {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false;
         const res = await this.$api.requested({
-          "id": 20221022165303,
+          "id": 20220920084101,
           "content": this.form
         })
         this.tool.showMessage(res,()=>{