Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

Html/src/view/fml/operation_manage/feedingBlanking.vue

@@ -370,11 +370,12 @@ export default {
             this.b = index;
             let status = this.stationList[index].status;
             this.sectionid = this.stationList[index].section;
-            // if (status == 3) {
+            if (status == 3) {
             //     this.attr1 = true;
             //     this.tabindex = "2";
-            //     this.getRunningDetail(index);
-            // } else {
+                this.getRunningDetail(index);
+            }
+            // else {
             //     this.attr2 = true;
             // }
             if (status == 2) {

Html/src/view/fml/statistical_analysis/lineMonitor.vue

@@ -352,10 +352,10 @@ export default {
                                 bgc = "#ff9900";
                             }
                             if (ele.status == 2) {
-                                bgc = "#2db7f5";
+                                bgc = "#19be6b";
                             }
                             if (ele.status == 3) {
-                                bgc = "#19be6b";
+                                bgc = "#2db7f5";
                             }
                             ele.bgc = bgc;
                         });

Html/src/view/fml/statistical_analysis/taskList.vue

@@ -124,20 +124,22 @@
                         >{{ $t("1001") }}</Button
                     >
                     <!--  -->
-                    <Button
+                    <!-- <Button
                         type="warning"
                         class="twoWord"
                         icon="ios-search"
                         @click="cancel()"
                         >取消</Button
-                    ><!--只有状态是待执行的可以改成取消-->
-                    <Button
+                    > -->
+                    <!--只有状态是待执行的可以改成取消-->
+                    <!-- <Button
                         type="primary"
                         class="twoWord"
                         icon="ios-search"
                         @click="manual()"
                         >手动</Button
-                    ><!--当生产线的模式是手动是才可以进行手动任务执行-->
+                    > -->
+                    <!--当生产线的模式是手动是才可以进行手动任务执行-->
                     <Button
                         type="primary"
                         class="twoWord"
@@ -197,6 +199,7 @@ export default {
                 {
                     title: "任务编号",
                     key: "taskno",
+                    width:300
                 },
                 {
                     title: "产线层级",
@@ -302,6 +305,7 @@ export default {
         this.columns1 = this.$time.initTableTitle(this.columns1);
         this.initlevel();
         this.iniproducts();
+        this.search(1,10);
     },
     methods: {
         search(page, pagesize) {

Html/src/view/fms/associate/assemblyInfo.vue

 <template>
     <div class="testdiv">
         <div class="divborder">
-            <h2>基本信息</h2>
             <div class="newSearchDiv">
                 <div class="filter">
                     <label>工装类别：</label>
@@ -206,6 +205,13 @@
                     <label>备注：</label>
                     <Input type="text" class="searchInput" v-model="remark" />
                 </div>
+                <div class="filter">
+                    <label><i>*</i>状态：</label>
+                    <RadioGroup v-model="addstatus">
+                        <Radio label="1"><span>可用</span></Radio>
+                        <Radio label="0"><span>停用</span></Radio>
+                    </RadioGroup>
+                </div>
                 <div>
                     <label>上传文件：</label>
                     <div class="accountInfoUploadFile">
@@ -412,6 +418,56 @@ export default {
                     title: "子工装编号",
                     key: "code",
                 },
+                {
+                    title: "状态",
+                    key: "status",
+                    render: (h, params) => {
+                        let str = "";
+                        if (params.row.status === 1) {
+                            str = "可用";
+                        } else {
+                            str = "停用";
+                        }
+                        return h("span", str);
+                    },
+                },
+                {
+                    title: "备注",
+                    key: "remark",
+                },
+                {
+                    title: "附件",
+                    key: "filename",
+                    render: (h, params) => {
+                        return h(
+                            "span",
+                            {
+                                style: {
+                                    color: "#2b85e4",
+                                    cursor: "pointer",
+                                },
+                                on: {
+                                    click: () => {
+                                        let name = params.row.filename;
+                                        let url = params.row.fileurl;
+                                        if (url) {
+                                            this.downFile(url, name);
+                                        }
+                                    },
+                                },
+                            },
+                            params.row.filename
+                        );
+                    },
+                },
+                {
+                    title: "维护人",
+                    key: "updator",
+                },
+                {
+                    title: "维护时间",
+                    key: "updatetime",
+                },
             ],
             modal: false,
             type: 0,
@@ -436,6 +492,7 @@ export default {
             UploadAction: this.axios.publicPath + "config/upload/UploadImage",
             detailobj: {},
             childObj: {},
+            addstatus:'1',//状态 1可用 0停用
         };
     },
     created() {
@@ -506,6 +563,7 @@ export default {
                 });
             }
             this.type = 1;
+            this.addstatus = '1';//状态 1可用 0停用
         },
         addPost() {
             let url = "";
@@ -516,6 +574,7 @@ export default {
                 filename: this.filename, //附件名称
                 status: 1,
                 remark: this.remark,
+                status:this.addstatus,
             };
             if (this.type == 1) {
                 url = "/acc/FixtureToolsAssembly/Add";
@@ -559,6 +618,7 @@ export default {
             this.remark = this.childObj.remark;
             this.disabled = true;
             this.type = 2;
+            this.addstatus = this.childObj.status+'';//状态 1可用 0停用
             this.modal = true;
         },
         dele() {

Server/Apis/Siger.ApiACC/Controllers/FixtureToolsAssemblyController.cs

@@ -39,9 +39,9 @@ namespace Siger.ApiACC.Controllers
         }
 
         [HttpGet]
-        public IActionResult GetPageList(string category, string code, string name, int page, int pagesize, string toexcel = "")
+        public IActionResult GetPageList(string category, string code, string name, string state, int page, int pagesize, string toexcel = "")
         {
-            var data = _toolsAssemblyRepository.GetPagedList(category.ToInt(), code, name, ProjectId, page, pagesize, toexcel);
+            var data = _toolsAssemblyRepository.GetPagedList(category.ToInt(), code, name,state.ToInt(), ProjectId, page, pagesize, toexcel);
             var categorys = _toolsCategoryRepository.GetList(q => q.projectId == ProjectId && q.status == (int)RowState.Valid).ToList();
             var list = new List<ResponseAumationFixtureToolsAssembly>();
             foreach(var item in data.Data)

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationFixtureToolsAssemblyRepository.cs

@@ -24,7 +24,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories
             _context = context;
         }
 
-        public IPagedCollectionResult<ResponseAumationFixtureToolsAssembly> GetPagedList(int category, string code, string name, int projectid, int page, int pagesize, string toexcel = "")
+        public IPagedCollectionResult<ResponseAumationFixtureToolsAssembly> GetPagedList(int category, string code, string name, int state, int projectid, int page, int pagesize, string toexcel = "")
         {
             var query = from q in _context.siger_automation_fixture_tools_assembly
                         join t1 in _context.siger_automation_fixture_tools on q.parent equals t1.guid into tt1
@@ -78,7 +78,12 @@ namespace Siger.Middlelayer.AccRepository.Repositories
             {
                 nameExpression = q => q.name.Contains(name);
             }
-            var expression = categoryExpression.And(codeExpression).And(nameExpression);
+            Expression<Func<ResponseAumationFixtureToolsAssembly, bool>> stateExpression = f => true;
+            if (state > 0)
+            {
+                stateExpression = q => q.status == state;
+            }
+            var expression = categoryExpression.And(codeExpression).And(nameExpression).And(stateExpression);
             if (toexcel.ToInt() == 1)
             {
                 var entities = query.Where(expression).OrderByDescending(q => q.id).AsNoTracking().ToList();

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/Interface/IAutomationFixtureToolsAssemblyRepository.cs

@@ -9,7 +9,7 @@ namespace Siger.Middlelayer.AccRepository.Repositories.Interface
 {
     public interface IAutomationFixtureToolsAssemblyRepository : IAccRepositoryBase<siger_automation_fixture_tools_assembly>
     {
-        IPagedCollectionResult<ResponseAumationFixtureToolsAssembly> GetPagedList(int category, string code, string name, int projectid, int page, int pagesize, string toexcel = "");
+        IPagedCollectionResult<ResponseAumationFixtureToolsAssembly> GetPagedList(int category, string code, string name, int state, int projectid, int page, int pagesize, string toexcel = "");
 
         IEnumerable<ResponseAumationFixtureToolsAssembly> GetDetailList(string parent, int projectid);