fix():修改路内bug

src/pages/InRoadMgm/PersonMgm/Attendance/ScheduleMgm/loadable.jsx

@@ -274,6 +274,8 @@ function ScheduleMgm(props) {
     let minutes1 = getStartTime != '' ? getStartTime.hour() * 60 + getStartTime.minute() : '';
     let minutes2 = getEndTime != '' ? getEndTime.hour() * 60 + getEndTime.minute() : '';
     let totalMinutes = minutes2 - minutes1;
+    console.log(minutes1, minutes2);
+    console.log(totalMinutes);
     const reg = /^(?:[1-9]\d?|1[0-7]\d|180|0)$/;
     if (editModal.scheduleName == "") {
       message.error("请输入班次名称");
@@ -397,6 +399,7 @@ function ScheduleMgm(props) {
     setGetStartTime(time);
   };
   const goingEditWork = (time, timeString) => {
+    console.log(time);
     setEditModal({ ...editModal, onTime: timeString });
     setGetStartTime(time);
   };
@@ -609,6 +612,7 @@ function ScheduleMgm(props) {
             <TimePicker
               onChange={goingWork}
               format={format}
+              allowClear={false}
               // value={moment("00:00", "HH:mm")}
               style={{ marginLeft: 30 }}
             />
@@ -619,6 +623,7 @@ function ScheduleMgm(props) {
             <TimePicker
               onChange={leavingWork}
               format={format}
+              allowClear={false}
               // value={moment("00:00", "HH:mm")}
               style={{ marginLeft: 30 }}
             />
@@ -731,6 +736,7 @@ function ScheduleMgm(props) {
             <TimePicker
               onChange={goingWork}
               disabled
+              allowClear={false}
               format={format}
               value={moment(getDetail.onTime, "HH:mm")}
               style={{ marginLeft: 30 }}
@@ -742,6 +748,7 @@ function ScheduleMgm(props) {
             <TimePicker
               onChange={leavingWork}
               disabled
+              allowClear={false}
               format={format}
               value={moment(getDetail.offTime, "HH:mm")}
               style={{ marginLeft: 30 }}
@@ -852,6 +859,7 @@ function ScheduleMgm(props) {
             <TimePicker
               onChange={goingEditWork}
               format={format}
+              allowClear={false}
               value={moment(editModal.onTime, "HH:mm")}
               style={{ marginLeft: 30, width: 100 }}
             />
@@ -862,6 +870,7 @@ function ScheduleMgm(props) {
             <TimePicker
               onChange={leavingEditWork}
               format={format}
+              allowClear={false}
               value={moment(editModal.offTime, "HH:mm")}
               style={{ marginLeft: 30, width: 100 }}
             />

src/pages/InRoadMgm/Stuff/ModelConf/index.scss

@@ -293,14 +293,14 @@ $color-primary : var(--color-primary);
     color: #fff;
     }
     .cancel{
-    width: 80px;
-    height: 35px;
-    background: #fff;
-    border: none;
-    border-radius: 4px;
-    color: #3e4557;
-    cursor: pointer;
-    margin-left: 20px;
-    }
+      width: 80px;
+      height: 35px;
+      background: #3e4557;
+      border: none;
+      border-radius: 4px;
+      color: #fff;
+      cursor: pointer;
+      margin-left: 20px;
+      }
   }
 }

src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx

@@ -116,6 +116,8 @@ function ModelConf(props) {
                 message.success('删除成功')
                 setDeleteVisible(false)
                 getData(formData)
+            }else{
+                message.error(res.message)
             }
         })
     }

src/pages/InRoadMgm/Stuff/StuffMgm/index.scss

@@ -279,3 +279,28 @@ $color-primary : var(--color-primary);
     }
   }
 }
+.deleteModal{
+  .submitBtn{
+    text-align: center;
+    margin-top: 20px;
+    .submit{
+      width: 80px;
+    height: 35px;
+    background: #409eff;
+    border: none;
+    border-radius: 4px;
+    cursor: pointer;
+    color: #fff;
+    }
+    .cancel{
+    width: 80px;
+    height: 35px;
+    background: #3e4557;
+    border: none;
+    border-radius: 4px;
+    color: #fff;
+    cursor: pointer;
+    margin-left: 20px;
+    }
+  }
+}

src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx

@@ -42,6 +42,7 @@ function StuffMgm(props) {
     const [editVisible, setEditVisible] = useState(false)
     const [getSelectStatus, setGetSelectStatus] = useState(true)
     const [addVisible, setAddVisible] = useState(false)
+    const [deleteVisible, setDeleteVisible] = useState(false)
     const [getCanCaDer, setGetCanCaDer] = useState([])//区域
 
     //物品编号
@@ -157,8 +158,10 @@ function StuffMgm(props) {
                     <Popover content={
                         <div className="operateBtn">
                             <div onClick={() => { CheckBtn(record) }}>查看</div>
-                            <div onClick={() => { translateBtn(record) }}>
-                                编辑</div>
+                            <div onClick={() => { translateBtn(record) }}>编辑</div>
+                            {
+                                record.status === '1' || record.status === '2' ? <div onClick={() => { deleteBtn(record) }}>删除</div> : ''
+                            }
                         </div>}>
                         <button className="scheduleBtn colorBtn">操作</button>
                     </Popover>
@@ -182,6 +185,29 @@ function StuffMgm(props) {
     const checkModal = () => {
         setCheckVisible(false)
     }
+    const [getRecord, setGetRecord] = useState({})
+    const deleteBtn = (record) => {
+        setGetRecord(record.id)
+        setDeleteVisible(true)
+    }
+    const deleteModalBtn = () => {
+        let data = {
+            id: getRecord
+        }
+        ajax.handleDeleteData(data).then((res) => {
+            if (res.status = 20000) {
+                message.success('删除成功')
+                setDeleteVisible(false)
+                getData(formData)
+            } else {
+                message.error(res.message)
+            }
+        })
+    }
+    //删除功能
+    const deleteModal = () => {
+        setDeleteVisible(false)
+    }
     //编辑弹窗
     const [getEditData, setGetEditData] = useState({
         region_id: null,//区域
@@ -272,7 +298,7 @@ function StuffMgm(props) {
         setFormData({
             ...parameter
         })
-        getData({...parameter,pn: 1} )
+        getData({ ...parameter, pn: 1 })
     }
     //检索数据
     const getSearchData = (data = formData) => {
@@ -558,6 +584,7 @@ function StuffMgm(props) {
     }
     const placeBtn = () => {
         setEditVisible(false)
+        setDeleteVisible(false)
         setGetEditData({
             region_id: [],//区域
             operatorid: '',
@@ -786,11 +813,11 @@ function StuffMgm(props) {
                 </div>
                 <div className="timePicker yisa-search">
                     <div className="btnBox">
-                        <Button type="primary" className="yisa-btn colorReset"  onClick={() => { getResetData() }}>
+                        <Button type="primary" className="yisa-btn colorReset" onClick={() => { getResetData() }}>
                             重置
                         </Button>
-                        <Button type="primary" className="yisa-btn colorBtn"  onClick={() => { getSearchData() }}>
-                        查询
+                        <Button type="primary" className="yisa-btn colorBtn" onClick={() => { getSearchData() }}>
+                            查询
                         </Button>
 
 
@@ -1084,11 +1111,11 @@ function StuffMgm(props) {
                             }
                             if (v === '1') {
                                 setGetSelectStatus(true)
-                                getEditData.uid=''
+                                getEditData.uid = ''
                             }
                             if (v === '2') {
                                 setGetSelectStatus(true)
-                                getEditData.uid=''
+                                getEditData.uid = ''
                             }
                             setGetEditData(
                                 Object.assign({}, getEditData, { status: v })
@@ -1135,6 +1162,24 @@ function StuffMgm(props) {
                 </div>
             </div>
         </Modal>
+        <Modal
+            visible={deleteVisible}
+            onCancel={deleteModal}
+            footer={null}
+            className="deleteModal"
+        >
+            <div className="delete">
+                此操作将删除该记录, 是否继续?
+            </div>
+            <div className="submitBtn">
+                <button type="primary" className="submit" onClick={() => { deleteModalBtn() }}>
+                    提交
+                </button>
+                <button type="primary" className="cancel colorReset" onClick={() => { placeBtn() }}>
+                    取消
+                </button>
+            </div>
+        </Modal>
     </>
 }
 

src/services/search.js

@@ -550,6 +550,14 @@ const brandDeleteData = (params) => {
     data: params,
   });
 };
+//物品管理-删除物品
+const handleDeleteData = (params) => {
+  return ajax({
+    url: "/api/bpm/bpmgoods/del_goods",
+    type: "post",
+    data: params,
+  });
+};
 //物品管理--型号配置-查看
 const checkBrandList = (params) => {
   return ajax({
@@ -1298,6 +1306,7 @@ export default {
   checkGoodsData,
   brandEditData,
   brandDeleteData,
+  handleDeleteData,
   checkBrandList,
   deleteRuleData,
   addRuleData,