hujie123456 5 years ago
parent
commit
fab5b624a4

+ 6 - 0
css/base.less

@@ -519,3 +519,9 @@ body {
     width: 50%;
     margin-bottom: 0px !important;
 }
+// .ant-modal {
+//   transition: all .5s !important;
+// }
+.ant-tabs-tabpane.ant-tabs-tabpane-active .ant-calendar-picker-input.ant-input {
+  width: 170px !important;
+}

+ 2 - 2
js/component/dataDic.js

@@ -2391,13 +2391,13 @@ module.exports = {
     liquidationStatus:[
         {
 	        value: "0",
-	        key: "首付待付"
+	        key: "首付待付"
 	    },{
 	        value: "1",
 	        key: "尾款待付清"
 	    },{
 	        value: "2",
-	        key: "已付"
+	        key: "已付"
 	    },{
 	        value: "3",
 	        key: "部分退款"

+ 87 - 7
js/component/manageCenter/financialManage/distribute/approvedOutsourcing.jsx

@@ -97,7 +97,8 @@ const approvedOutsourcing = React.createClass({
         departmentId: this.state.departmenttList,
         processStatus: this.state.processStatusSearch,
         contractNo: this.state.contractNoSearch,
-        outsource: 1
+        outsource: 1,
+        liquidationStatus: this.state.liquidationStatus
       },
       success: function(data) {
         let theArr = [];
@@ -1497,7 +1498,19 @@ const approvedOutsourcing = React.createClass({
                 <Option value="3">未分配</Option>
                 <Option value="4">已分配</Option>
               </Select>
-              <span style={{ marginRight: 10 }}>下单日期:</span>
+              <Select
+                placeholder="结算状态"
+                onChange={e => {
+                  this.setState({ liquidationStatus: e });
+                }}
+                style={{ width: 160, marginRight: 5 }}
+                value={this.state.liquidationStatus}
+              >
+                <Option value="0">首付待付清</Option>
+                <Option value="1">尾款待付清</Option>
+                <Option value="2">已付清</Option>
+              </Select>
+              <span style={{ marginRight: 0 }}>下单日期:</span>
               <RangePicker
                 value={[
                   this.state.releaseDate[0]
@@ -1790,7 +1803,10 @@ const approvedOutsourcing = React.createClass({
                           footer={null}
                           visible={this.state.previewVisible}
                           onCancel={() => {
-                            this.setState({ previewVisible: false });
+                            this.setState({
+                              previewVisible: false,
+                              rotateDeg: 0
+                            });
                           }}
                         >
                           <img
@@ -1801,9 +1817,38 @@ const approvedOutsourcing = React.createClass({
                             }}
                             src={this.state.previewImage || ""}
                           />
-                          <Button onClick={this.rotate}>旋转</Button>
-                          <Button onClick={this.upImg}>上一张</Button>
-                          <Button onClick={this.downImg}>下一张</Button>
+                          <Button
+                            onClick={this.rotate}
+                            style={{
+                              position: "relative",
+                              left: "50%",
+                              transform: "translateX(-50%)"
+                            }}
+                          >
+                            旋转
+                          </Button>
+                          <Button
+                            onClick={this.upImg}
+                            style={{
+                              position: "absolute",
+                              left: -81,
+                              top: "50%",
+                              transform: "translateY(-50%)"
+                            }}
+                          >
+                            上一张
+                          </Button>
+                          <Button
+                            onClick={this.downImg}
+                            style={{
+                              position: "absolute",
+                              right: -81,
+                              top: "50%",
+                              transform: "translateY(-50%)"
+                            }}
+                          >
+                            下一张
+                          </Button>
                         </Modal>
                         <Button
                           style={{
@@ -2069,9 +2114,44 @@ const approvedOutsourcing = React.createClass({
                     >
                       <img
                         alt=""
-                        style={{ width: "100%" }}
+                        style={{
+                          width: "100%",
+                          transform: `rotate(${this.state.rotateDeg}deg)`
+                        }}
                         src={this.state.previewImage || ""}
                       />
+                      <Button
+                        onClick={this.rotate}
+                        style={{
+                          position: "relative",
+                          left: "50%",
+                          transform: "translateX(-50%)"
+                        }}
+                      >
+                        旋转
+                      </Button>
+                      <Button
+                        onClick={this.upImg}
+                        style={{
+                          position: "absolute",
+                          left: -81,
+                          top: "50%",
+                          transform: "translateY(-50%)"
+                        }}
+                      >
+                        上一张
+                      </Button>
+                      <Button
+                        onClick={this.downImg}
+                        style={{
+                          position: "absolute",
+                          right: -81,
+                          top: "50%",
+                          transform: "translateY(-50%)"
+                        }}
+                      >
+                        下一张
+                      </Button>
                     </Modal>
                   </FormItem>
                 </div>

+ 91 - 10
js/component/manageCenter/financialManage/distribute/approvedOutsourcingAll.jsx

@@ -95,9 +95,10 @@ const approvedOutsourcingAll = React.createClass({
         startFinalReceivablesTime: this.state.shouKuanDate[0],
         endFinalReceivablesTime: this.state.shouKuanDate[1],
         departmentId: this.state.departmenttList,
-        // processStatus: this.state.processStatusSearch,
+        processStatus: this.state.processStatusSearch,
         contractNo: this.state.contractNoSearch,
-        outsource: 1
+        outsource: 1,
+        liquidationStatus: this.state.liquidationStatus
       },
       success: function(data) {
         let theArr = [];
@@ -1486,7 +1487,7 @@ const approvedOutsourcingAll = React.createClass({
                   });
                 }}
               />
-              {/* <Select
+              <Select
                 placeholder="流程状态"
                 onChange={e => {
                   this.setState({ processStatusSearch: e });
@@ -1496,8 +1497,20 @@ const approvedOutsourcingAll = React.createClass({
               >
                 <Option value="3">未分配</Option>
                 <Option value="4">已分配</Option>
-              </Select> */}
-              <span style={{ marginRight: 10 }}>下单日期:</span>
+              </Select>
+              <Select
+                placeholder="结算状态"
+                onChange={e => {
+                  this.setState({ liquidationStatus: e });
+                }}
+                style={{ width: 160, marginRight: 5 }}
+                value={this.state.liquidationStatus}
+              >
+                <Option value="0">首付待付清</Option>
+                <Option value="1">尾款待付清</Option>
+                <Option value="2">已付清</Option>
+              </Select>
+              <span style={{ marginRight: 0 }}>下单日期:</span>
               <RangePicker
                 value={[
                   this.state.releaseDate[0]
@@ -1507,6 +1520,7 @@ const approvedOutsourcingAll = React.createClass({
                     ? moment(this.state.releaseDate[1])
                     : null
                 ]}
+                style={{ marginRight: 5 }}
                 onChange={(data, dataString) => {
                   this.setState({ releaseDate: dataString });
                 }}
@@ -1790,7 +1804,10 @@ const approvedOutsourcingAll = React.createClass({
                           footer={null}
                           visible={this.state.previewVisible}
                           onCancel={() => {
-                            this.setState({ previewVisible: false });
+                            this.setState({
+                              previewVisible: false,
+                              rotateDeg: 0
+                            });
                           }}
                         >
                           <img
@@ -1801,9 +1818,38 @@ const approvedOutsourcingAll = React.createClass({
                             }}
                             src={this.state.previewImage || ""}
                           />
-                          <Button onClick={this.rotate}>旋转</Button>
-                          <Button onClick={this.upImg}>上一张</Button>
-                          <Button onClick={this.downImg}>下一张</Button>
+                          <Button
+                            onClick={this.rotate}
+                            style={{
+                              position: "relative",
+                              left: "50%",
+                              transform: "translateX(-50%)"
+                            }}
+                          >
+                            旋转
+                          </Button>
+                          <Button
+                            onClick={this.upImg}
+                            style={{
+                              position: "absolute",
+                              left: -81,
+                              top: "50%",
+                              transform: "translateY(-50%)"
+                            }}
+                          >
+                            上一张
+                          </Button>
+                          <Button
+                            onClick={this.downImg}
+                            style={{
+                              position: "absolute",
+                              right: -81,
+                              top: "50%",
+                              transform: "translateY(-50%)"
+                            }}
+                          >
+                            下一张
+                          </Button>
                         </Modal>
                         <Button
                           style={{
@@ -2069,9 +2115,44 @@ const approvedOutsourcingAll = React.createClass({
                     >
                       <img
                         alt=""
-                        style={{ width: "100%" }}
+                        style={{
+                          width: "100%",
+                          transform: `rotate(${this.state.rotateDeg}deg)`
+                        }}
                         src={this.state.previewImage || ""}
                       />
+                      <Button
+                        onClick={this.rotate}
+                        style={{
+                          position: "relative",
+                          left: "50%",
+                          transform: "translateX(-50%)"
+                        }}
+                      >
+                        旋转
+                      </Button>
+                      <Button
+                        onClick={this.upImg}
+                        style={{
+                          position: "absolute",
+                          left: -81,
+                          top: "50%",
+                          transform: "translateY(-50%)"
+                        }}
+                      >
+                        上一张
+                      </Button>
+                      <Button
+                        onClick={this.downImg}
+                        style={{
+                          position: "absolute",
+                          right: -81,
+                          top: "50%",
+                          transform: "translateY(-50%)"
+                        }}
+                      >
+                        下一张
+                      </Button>
                     </Modal>
                   </FormItem>
                 </div>

+ 1 - 1
js/component/manageCenter/financialManage/distribute/huiKuan.jsx

@@ -794,7 +794,7 @@ const HuiKuan = React.createClass({
                 // left: 400,
                 // transform: "translateX(-50%)",
                 display: "inline-block",
-                width: 119,
+                width: 122,
                 height: 28,
                 overflow: "hidden"
               }}

+ 5 - 2
js/component/manageCenter/financialManage/distribute/shouKuan.less

@@ -1,3 +1,6 @@
-.ant-calendar-picker-input.ant-input {
-    width: 200px !important;
+// .ant-calendar-picker-input.ant-input {
+//     width: 200px !important;
+// }
+.half-item .ant-calendar-picker-input.ant-input {
+    width: 155px !important;
 }

+ 17 - 4
js/component/manageCenter/financialManage/distribute/shouKuanAll.jsx

@@ -95,8 +95,9 @@ const ShouKuangAll = React.createClass({
         startFinalReceivablesTime: this.state.shouKuanDate[0],
         endFinalReceivablesTime: this.state.shouKuanDate[1],
         departmentId: this.state.departmenttList,
-        // processStatus: this.state.processStatusSearch,
-        contractNo: this.state.contractNoSearch
+        processStatus: this.state.processStatusSearch,
+        contractNo: this.state.contractNoSearch,
+        liquidationStatus: this.state.liquidationStatus
       },
       success: function(data) {
         let theArr = [];
@@ -961,7 +962,7 @@ const ShouKuangAll = React.createClass({
                   });
                 }}
               />
-              {/* <Select
+              <Select
                 placeholder="流程状态"
                 onChange={e => {
                   this.setState({ processStatusSearch: e });
@@ -971,7 +972,19 @@ const ShouKuangAll = React.createClass({
               >
                 <Option value="3">未分配</Option>
                 <Option value="4">已分配</Option>
-              </Select> */}
+              </Select>
+              <Select
+                placeholder="结算状态"
+                onChange={e => {
+                  this.setState({ liquidationStatus: e });
+                }}
+                style={{ width: 160, marginRight: 5 }}
+                value={this.state.liquidationStatus}
+              >
+                <Option value="0">首付待付清</Option>
+                <Option value="1">尾款待付清</Option>
+                <Option value="2">已付清</Option>
+              </Select>
               <span style={{}}>下单日期:</span>
               <RangePicker
                 value={[

+ 14 - 1
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -96,7 +96,8 @@ const ShouKuang = React.createClass({
         endFinalReceivablesTime: this.state.shouKuanDate[1],
         departmentId: this.state.departmenttList,
         processStatus: this.state.processStatusSearch,
-        contractNo: this.state.contractNoSearch
+        contractNo: this.state.contractNoSearch,
+        liquidationStatus: this.state.liquidationStatus
       },
       success: function(data) {
         let theArr = [];
@@ -967,6 +968,18 @@ const ShouKuang = React.createClass({
                 <Option value="3">未分配</Option>
                 <Option value="4">已分配</Option>
               </Select>
+              <Select
+                placeholder="结算状态"
+                onChange={e => {
+                  this.setState({ liquidationStatus: e });
+                }}
+                style={{ width: 160, marginRight: 5 }}
+                value={this.state.liquidationStatus}
+              >
+                <Option value="0">首付待付清</Option>
+                <Option value="1">尾款待付清</Option>
+                <Option value="2">已付清</Option>
+              </Select>
               <span style={{}}>下单日期:</span>
               <RangePicker
                 value={[

+ 33 - 4
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -459,7 +459,7 @@ const OrderDetail = Form.create()(React.createClass({
                       footer={null}
                       visible={this.state.previewVisible}
                       onCancel={() => {
-                        this.setState({ previewVisible: false });
+                        this.setState({ previewVisible: false, rotateDeg: 0 });
                       }}
                     >
                       <img
@@ -470,9 +470,38 @@ const OrderDetail = Form.create()(React.createClass({
                         }}
                         src={this.state.previewImage || ""}
                       />
-                      <Button onClick={this.rotate}>旋转</Button>
-                      <Button onClick={this.upImg}>上一张</Button>
-                      <Button onClick={this.downImg}>下一张</Button>
+                      <Button
+                        onClick={this.rotate}
+                        style={{
+                          position: "relative",
+                          left: "50%",
+                          transform: "translateX(-50%)"
+                        }}
+                      >
+                        旋转
+                      </Button>
+                      <Button
+                        onClick={this.upImg}
+                        style={{
+                          position: "absolute",
+                          left: -81,
+                          top: "50%",
+                          transform: "translateY(-50%)"
+                        }}
+                      >
+                        上一张
+                      </Button>
+                      <Button
+                        onClick={this.downImg}
+                        style={{
+                          position: "absolute",
+                          right: -81,
+                          top: "50%",
+                          transform: "translateY(-50%)"
+                        }}
+                      >
+                        下一张
+                      </Button>
                     </Modal>
                     <Button
                       style={{

+ 2 - 2
js/component/manageCenter/order/orderNew/addService.jsx

@@ -1639,7 +1639,7 @@ const NewService = Form.create()(
                                   <DatePicker
                                     style={{
                                       marginTop: "2px",
-                                      width: "240px",
+                                      // width: "240px",
                                       height: "32px"
                                     }}
                                     showTime
@@ -1654,7 +1654,7 @@ const NewService = Form.create()(
                                       this.setState({ signDate: dataString });
                                     }}
                                   />
-                                  <span className="mandatory">*</span>
+                                  <span className="mandatory" style={{marginLeft: 20}}>*</span>
                                 </FormItem>
                                 <FormItem
                                   className="half-item"

+ 33 - 4
js/component/manageCenter/order/orderNew/changeComponent/changeDetailCwzy.js

@@ -913,7 +913,7 @@ class ChangeDetail extends Component {
               footer={null}
               visible={this.state.previewVisible}
               onCancel={() => {
-                this.setState({ previewVisible: false }, () => {
+                this.setState({ previewVisible: false, rotateDeg: 0 }, () => {
                   this.reset();
                 });
               }}
@@ -926,9 +926,38 @@ class ChangeDetail extends Component {
                 }}
                 src={this.state.previewImage || ""}
               />
-              <Button onClick={this.rotate}>旋转</Button>
-              <Button onClick={this.upImg}>上一张</Button>
-              <Button onClick={this.downImg}>下一张</Button>
+              <Button
+                onClick={this.rotate}
+                style={{
+                  position: "relative",
+                  left: "50%",
+                  transform: "translateX(-50%)"
+                }}
+              >
+                旋转
+              </Button>
+              <Button
+                onClick={this.upImg}
+                style={{
+                  position: "absolute",
+                  left: -81,
+                  top: "50%",
+                  transform: "translateY(-50%)"
+                }}
+              >
+                上一张
+              </Button>
+              <Button
+                onClick={this.downImg}
+                style={{
+                  position: "absolute",
+                  right: -81,
+                  top: "50%",
+                  transform: "translateY(-50%)"
+                }}
+              >
+                下一张
+              </Button>
             </Modal>
             <Rizhi changeId={this.props.data.id} />
           </Form.Item>

+ 87 - 11
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -141,33 +141,80 @@ class OrderDetail extends Component {
   }
   downImg() {
     console.log(this.props.pictureUrl);
-    
+    const data = this.props.orderData;
     let num = 0;
-    for (let i = 0; i < this.props.pictureUrl.length; i++) {
-      if (this.props.pictureUrl[i].url == this.state.previewImage) {
+    for (
+      let i = 0;
+      i <
+      splitUrl(
+        data.contractPictureUrl,
+        ",",
+        globalConfig.avatarHost + "/upload"
+      ).length;
+      i++
+    ) {
+      if (
+        splitUrl(
+          data.contractPictureUrl,
+          ",",
+          globalConfig.avatarHost + "/upload"
+        )[i].url == this.state.previewImage
+      ) {
         num = i;
       }
     }
-    if (num == this.props.pictureUrl.length - 1) {
+    if (
+      num ==
+      splitUrl(
+        data.contractPictureUrl,
+        ",",
+        globalConfig.avatarHost + "/upload"
+      ).length -
+        1
+    ) {
       return message.warning("已经是最后一张了哦");
     }
-    this.state.previewImage = this.props.pictureUrl[num + 1].url;
+    this.state.previewImage = splitUrl(
+      data.contractPictureUrl,
+      ",",
+      globalConfig.avatarHost + "/upload"
+    )[num + 1].url;
     this.setState({
       previewImage: this.state.previewImage,
       rotateDeg: 0
     });
   }
   upImg() {
+    const data = this.props.orderData;
     let num = 0;
-    for (let i = 0; i < this.props.pictureUrl.length; i++) {
-      if (this.props.pictureUrl[i].url == this.state.previewImage) {
+    for (
+      let i = 0;
+      i <
+      splitUrl(
+        data.contractPictureUrl,
+        ",",
+        globalConfig.avatarHost + "/upload"
+      ).length;
+      i++
+    ) {
+      if (
+        splitUrl(
+          data.contractPictureUrl,
+          ",",
+          globalConfig.avatarHost + "/upload"
+        )[i].url == this.state.previewImage
+      ) {
         num = i;
       }
     }
     if (num == 0) {
       return message.warning("已经是第一张了哦");
     }
-    this.state.previewImage = this.props.pictureUrl[num - 1].url;
+    this.state.previewImage = splitUrl(
+      data.contractPictureUrl,
+      ",",
+      globalConfig.avatarHost + "/upload"
+    )[num - 1].url;
     this.setState({
       previewImage: this.state.previewImage,
       rotateDeg: 0
@@ -310,9 +357,38 @@ class OrderDetail extends Component {
                 }}
                 src={this.state.previewImage || ""}
               />
-              <Button onClick={this.rotate}>旋转</Button>
-              <Button onClick={this.upImg}>上一张</Button>
-              <Button onClick={this.downImg}>下一张</Button>
+              <Button
+                onClick={this.rotate}
+                style={{
+                  position: "relative",
+                  left: "50%",
+                  transform: "translateX(-50%)"
+                }}
+              >
+                旋转
+              </Button>
+              <Button
+                onClick={this.upImg}
+                style={{
+                  position: "absolute",
+                  left: -81,
+                  top: "50%",
+                  transform: "translateY(-50%)"
+                }}
+              >
+                上一张
+              </Button>
+              <Button
+                onClick={this.downImg}
+                style={{
+                  position: "absolute",
+                  right: -81,
+                  top: "50%",
+                  transform: "translateY(-50%)"
+                }}
+              >
+                下一张
+              </Button>
             </Modal>
             <Button
               style={{

+ 8 - 8
js/component/manageCenter/set/userManagementS/user.jsx

@@ -102,13 +102,13 @@ const User = Form.create()(React.createClass({
 				pageNo: pageNo || 1,
 				pageSize: this.state.paginations.pageSize,
 				name: this.state.userNameSearchs,
-				departmentId: admin?this.state.organizationSearch:departmentId,
-				rid: this.state.rolesSearch,
-				duty: this.state.postSearch,
-				position: this.state.stationSearch,
-				status: this.state.statusSeach,
-				mobile: this.state.signNameSearch,
-				superiorId: this.state.theTypes
+				// departmentId: admin?this.state.organizationSearch:departmentId,
+				// rid: this.state.rolesSearch,
+				// duty: this.state.postSearch,
+				// position: this.state.stationSearch,
+				// status: this.state.statusSeach,
+				// mobile: this.state.signNameSearch,
+				// superiorId: this.state.theTypes
 			},
 			success: function(data) {
 				let theArr = [];
@@ -295,7 +295,7 @@ const User = Form.create()(React.createClass({
 		this.setState({
 			visible: false
 		});
-		this.reset();
+		this.resets();
 	},
 	//一键离职
 	examineOK(record){