合同相关修改

src/pages/ContractManager/component/Modal.jsx

@@ -128,12 +128,23 @@ const ContractModal = (props) => {
   useEffect(() => {
     const item = companyData?.find((item) => item.ID == company);
     if (item?.Flag == 1) {
+      //公司为本部
       setDepDisable(false);
-      form.setFieldsValue({ dep_id: '', archives_dep: '' });
+      form.setFieldsValue({
+        dep_id: '',
+        archives_dep: '',
+        created_dep: '',
+        deal_by: user?.CName,
+      });
       // setDealDisable(false);
     } else {
       setDepDisable(true);
-      form.setFieldsValue({ dep_id: '综合管理部', archives_dep: '综合管理部' });
+      form.setFieldsValue({
+        dep_id: '综合管理部',
+        archives_dep: '综合管理部',
+        created_dep: '综合管理部',
+        deal_by: '',
+      });
       // setDealDisable(true);
       // form.setFieldsValue({ deal_by: user?.CName });
     }
@@ -237,7 +248,6 @@ const ContractModal = (props) => {
           values.dep_id = 0;
         }
         values.created_by = user?.ID;
-        console.log('-=-=-=-=-=-=-----values--------------', values);
         handleOk(values);
       } else if (type == Type.cancel) {
         let result = {
@@ -379,7 +389,7 @@ const ContractModal = (props) => {
               name="deal_by"
               label="经办人："
               tooltip="经办人应负责合同审批流程、签字盖章、合同原件存档和电子档案存档。母公司的经办人为OA审批提交人，也是存档人。子公司经办人由子公司合同专员填写，一般是合同审批时的提交人或者是合同实际执行的负责人"
-              initialValue={data?.deal_by || user?.CName}
+              initialValue={data?.deal_by}
               rules={[
                 {
                   required: true,
@@ -387,11 +397,12 @@ const ContractModal = (props) => {
                 },
               ]}
             >
-              <Select
+              <Input disabled={!depDisable} />
+              {/* <Select
                 showSearch
                 style={{ width: '100%' }}
                 placeholder="请选择"
-                disabled
+                disabled={!depDisable}
                 filterOption={(input, option) =>
                   (option?.label ?? '')
                     .toLowerCase()
@@ -403,7 +414,7 @@ const ContractModal = (props) => {
                     label: item.CName,
                   };
                 })}
-              />
+              /> */}
             </Form.Item>
           </Col>
           <Col span={10}>
@@ -424,7 +435,7 @@ const ContractModal = (props) => {
                 placeholder="请选择"
                 showSearch
                 allowClear
-                disabled={disableds.contract}
+                disabled={disableds.contract || depDisable}
                 fieldNames={{
                   label: 'Name',
                   value: 'Name',
@@ -495,7 +506,7 @@ const ContractModal = (props) => {
             <Form.Item
               name="project_name"
               label="项目名称："
-              tooltip="不涉及项目请填写“不涉及”"
+              tooltip="不涉及项目请选“日常项目”"
               initialValue={data?.project_name}
               rules={[
                 {
@@ -504,17 +515,18 @@ const ContractModal = (props) => {
                 },
               ]}
             >
-              <InputSelect
+              {/* <InputSelect
                 list={projectList?.map((item) => {
                   return {
                     key: item.id,
                     value: item.project_name,
                   };
                 })}
-              />
-              {/* <Select
+              /> */}
+              <Select
                 style={{ width: '100%' }}
                 placeholder="请选择"
+                showSearch
                 options={projectList?.map((item) => {
                   return {
                     value: item.project_name,
@@ -522,7 +534,7 @@ const ContractModal = (props) => {
                   };
                 })}
                 disabled={disableds.contract}
-              /> */}
+              />
             </Form.Item>
             <Form.Item
               name="party_a"
@@ -556,6 +568,7 @@ const ContractModal = (props) => {
             <Form.Item
               style={{ opacity: is_supplement ? 1 : 0 }}
               name="parent_code"
+              tooltip="请先查询原合同编号，原合同未录入本系统的，需先录入存档。"
               initialValue={data?.parent_code}
               label="原合同编号："
               rules={
@@ -573,17 +586,17 @@ const ContractModal = (props) => {
             </Form.Item>
             <Form.Item
               name="code"
-              tooltip="请与OA审批时填写的合同编号一致。合同编号应按《合同管理办法》的合同编码规则编号"
+              tooltip="合同编号按《合同管理办法》的合同编码规则编号。"
               initialValue={data?.code}
               label="合同编号："
-              rules={[
-                {
-                  required: true,
-                  message: '请填写合同编号',
-                },
-              ]}
+              // rules={[
+              //   {
+              //     required: true,
+              //     message: '请填写合同编号',
+              //   },
+              // ]}
             >
-              <Input placeholder="请填写" />
+              <Input placeholder="提交后自动生成" disabled />
             </Form.Item>
             <Form.Item
               label="合同总价款："