fix: 数据后台，配置编办，新增“编办地区”GLY-6041

modules/all_models/compilation.js

@@ -83,6 +83,8 @@ let modelSchema = {
   edition: String,
   // 序号（用于排序）
   serialNumber: Number,
+  // 编办地区
+  compilationArea: String,
   // 发布时间
   release_time: {
     type: Number,

modules/users/controllers/compilation_controller.js

@@ -989,6 +989,18 @@ class CompilationController extends BaseController {
       response.json({ err: 1, msg: err, data: null });
     }
   }
+
+  async setCompilationArea(request, response) {
+    let compilationId = request.body.id;
+    let compilationArea = request.body.compilationArea;
+    try {
+      let compilationModel = new CompilationModel();
+      await compilationModel.setCompilationArea(compilationId, compilationArea);
+      response.json({ err: 0, msg: "", data: null });
+    } catch (err) {
+      response.json({ err: 1, msg: err, data: null });
+    }
+  }
 }
 
 export default CompilationController;

modules/users/models/compilation_model.js

@@ -57,6 +57,7 @@ class CompilationModel extends BaseModel {
             edition: 1,
             freeUse: 1,
             customMade: 1,
+            compilationArea: 1,
             "ration_valuation.id": 1,
             "ration_valuation.name": 1,
             "ration_valuation.enable": 1,
@@ -592,6 +593,19 @@ class CompilationModel extends BaseModel {
   async setSerialNumber(compilationId, serialNumber) {
     return await this.updateById(compilationId, { serialNumber: serialNumber });
   }
+
+  /*
+   * 设置编办地区
+   *
+   * @param {String} compilationId
+   * @param {String} compilationArea
+   * @return {Promise}
+   * */
+  async setCompilationArea(compilationId, compilationArea) {
+    return await this.updateById(compilationId, {
+      compilationArea: compilationArea,
+    });
+  }
 }
 
 export default CompilationModel;

modules/users/routes/compilation_route.js

@@ -11,35 +11,176 @@ import CompilationController from "../controllers/compilation_controller";
 const router = Express.Router();
 const compilationController = new CompilationController();
 module.exports = function (app) {
-    // action定义区域
-    router.get('/', compilationController.auth, compilationController.init, compilationController.index);
-    router.get('/valuation/:section/:id', compilationController.auth, compilationController.init, compilationController.editValuation);
-    router.get('/:section/:id/:engineerID', compilationController.auth, compilationController.init, compilationController.editEngineering);
-    router.get('/valuation/:section/delete/:id', compilationController.auth, compilationController.init, compilationController.deleteValuation);
-    router.get('/template/:section/:id/:engineering', compilationController.auth, compilationController.init, compilationController.billsTemplate);
+  // action定义区域
+  router.get(
+    "/",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.index
+  );
+  router.get(
+    "/valuation/:section/:id",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.editValuation
+  );
+  router.get(
+    "/:section/:id/:engineerID",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.editEngineering
+  );
+  router.get(
+    "/valuation/:section/delete/:id",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.deleteValuation
+  );
+  router.get(
+    "/template/:section/:id/:engineering",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.billsTemplate
+  );
 
-    router.post('/release', compilationController.auth, compilationController.init, compilationController.release);
-    router.post('/add', compilationController.auth, compilationController.init, compilationController.addCompilation);
-    router.post('/setDescription', compilationController.auth, compilationController.init, compilationController.setDescription);
-    router.post('/setOverWriteUrl', compilationController.auth, compilationController.init, compilationController.setOverWriteUrl);
-    router.post('/setExample', compilationController.auth, compilationController.init, compilationController.setExample);
-    router.post('/add-valuation', compilationController.auth, compilationController.init, compilationController.addValuation);
-    router.post('/save-valuation', compilationController.auth, compilationController.init, compilationController.saveValuation);
-    router.post('/update-engineer', compilationController.auth, compilationController.init, compilationController.updateEngineer);
-    router.post('/delete-engineer', compilationController.auth, compilationController.init, compilationController.deleteEngineer);
-    router.post('/copy-engineer', compilationController.auth, compilationController.init, compilationController.copyEngineer);
-    router.post('/save-lib', compilationController.auth, compilationController.init, compilationController.saveEngineering);
-    router.post('/valuation/:section/enable', compilationController.auth, compilationController.init, compilationController.enableSwitch);
-    router.post('/valuation/:section/fileTypes', compilationController.auth, compilationController.init, compilationController.setFileTypes);
-    router.post('/template/:section/:id/:engineering/update', compilationController.auth, compilationController.init, compilationController.updateBillsTemplate);
-    router.post('/addEngineer', compilationController.auth, compilationController.init, compilationController.addEngineer);
-    router.post('/copyRationLibs', compilationController.auth, compilationController.init, compilationController.copyRationLibs);
+  router.post(
+    "/release",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.release
+  );
+  router.post(
+    "/add",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.addCompilation
+  );
+  router.post(
+    "/setDescription",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.setDescription
+  );
+  router.post(
+    "/setOverWriteUrl",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.setOverWriteUrl
+  );
+  router.post(
+    "/setExample",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.setExample
+  );
+  router.post(
+    "/add-valuation",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.addValuation
+  );
+  router.post(
+    "/save-valuation",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.saveValuation
+  );
+  router.post(
+    "/update-engineer",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.updateEngineer
+  );
+  router.post(
+    "/delete-engineer",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.deleteEngineer
+  );
+  router.post(
+    "/copy-engineer",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.copyEngineer
+  );
+  router.post(
+    "/save-lib",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.saveEngineering
+  );
+  router.post(
+    "/valuation/:section/enable",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.enableSwitch
+  );
+  router.post(
+    "/valuation/:section/fileTypes",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.setFileTypes
+  );
+  router.post(
+    "/template/:section/:id/:engineering/update",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.updateBillsTemplate
+  );
+  router.post(
+    "/addEngineer",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.addEngineer
+  );
+  router.post(
+    "/copyRationLibs",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.copyRationLibs
+  );
 
-    router.post('/changeCategory', compilationController.auth, compilationController.init, compilationController.changeCategory);
-    router.post('/changeLocation', compilationController.auth, compilationController.init, compilationController.changeLocation);
-    router.post('/changeCompilation', compilationController.auth, compilationController.init, compilationController.changeCompilation);
-    router.post('/changeFreeUse', compilationController.auth, compilationController.init, compilationController.changeFreeUse);
-    router.post('/setEdition', compilationController.auth, compilationController.init, compilationController.setEdition);
-    router.post('/setSerialNumber', compilationController.auth, compilationController.init, compilationController.setSerialNumber);
-    app.use("/compilation", router);
+  router.post(
+    "/changeCategory",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.changeCategory
+  );
+  router.post(
+    "/changeLocation",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.changeLocation
+  );
+  router.post(
+    "/changeCompilation",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.changeCompilation
+  );
+  router.post(
+    "/changeFreeUse",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.changeFreeUse
+  );
+  router.post(
+    "/setEdition",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.setEdition
+  );
+  router.post(
+    "/setSerialNumber",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.setSerialNumber
+  );
+  router.post(
+    "/setCompilationArea",
+    compilationController.auth,
+    compilationController.init,
+    compilationController.setCompilationArea
+  );
+  app.use("/compilation", router);
 };

web/users/js/compilation.js

@@ -795,6 +795,22 @@ $(document).ready(function () {
   });
 
   //更改版本号
+  $("#compilationArea").change(function () {
+    let compilationArea = $(this).val();
+    $.ajax({
+      url: "/compilation/setCompilationArea",
+      type: "post",
+      dataType: "json",
+      data: { id, compilationArea },
+      success: function (response) {
+        if (response.err !== 0) {
+          alert("更改失败");
+        }
+      },
+    });
+  });
+
+  //更改版本号
   $("#edition").change(function () {
     let edition = $(this).val();
     $.ajax({

web/users/views/compilation/index.html

@@ -301,13 +301,24 @@
                             <% }) %>
                     </select>
                 </td></tr>
-                <tr><td><p>编办类型</p>
+                <tr><td>
+                    <div style="display: inline-block;"><p>编办类型</p>
                     <select class="form-control" style="width:200px" id="type-select">
                         <option value=""></option>
                         <% typeList.forEach(function(type) { %>
-                            <option value="<%= type.value %>" <% if (selectedCompilation.type !== undefined && type.value === selectedCompilation.type) { %>selected="selected"<% } %> ><%= type.label %></option>
+                            <option value="<%= type.value %>" <% if (selectedCompilation.type !==undefined &&
+                                type.value===selectedCompilation.type) { %>selected="selected"<% } %> ><%= type.label %>
+                            </option>
                             <% }) %>
-                    </select>
+                    </select></div>
+                <div style="display: inline-block;">
+                    <p>编办地区</p>
+                <input class="form-control" type="text" style="width: 200px;" id="compilationArea" value="<%= selectedCompilation.compilationArea%>" />
+            </div>
+
+                   
+                </td><td>
+                    
                 </td></tr>
                 <tr>
                     <td>